diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | asm/rom1.s | 4736 | ||||
| -rw-r--r-- | asm/rom2.s | 24 | ||||
| -rw-r--r-- | asm/rom3.s | 910 | ||||
| -rw-r--r-- | asm/rom4.s | 240 | ||||
| -rw-r--r-- | asm/rom5.s | 3554 | ||||
| -rw-r--r-- | data/data2.s | 72 | ||||
| -rw-r--r-- | data/graphics/field_objects/field_effect_objects.s | 80 | ||||
| -rw-r--r-- | data/graphics/field_objects/map_object_graphics_info.s | 428 | ||||
| -rw-r--r-- | include/gba/defines.h | 49 | ||||
| -rw-r--r-- | include/gba/gba.h | 57 | ||||
| -rw-r--r-- | include/gba/syscall.h | 4 | ||||
| -rw-r--r-- | include/gba/types.h | 70 | ||||
| -rw-r--r-- | include/global.h | 6 | ||||
| -rw-r--r-- | include/main.h | 45 | ||||
| -rw-r--r-- | include/sprite.h | 242 | ||||
| -rw-r--r-- | ld_script.txt | 6 | ||||
| -rw-r--r-- | src/main.c | 45 | ||||
| -rw-r--r-- | src/sprite.c | 1795 | ||||
| -rw-r--r-- | tools/preproc/Makefile | 6 | ||||
| -rw-r--r-- | tools/preproc/asm_file.cpp | 168 | ||||
| -rw-r--r-- | tools/preproc/asm_file.h | 4 | ||||
| -rw-r--r-- | tools/preproc/c_file.cpp | 199 | ||||
| -rw-r--r-- | tools/preproc/c_file.h | 50 | ||||
| -rw-r--r-- | tools/preproc/charmap.cpp | 3 | ||||
| -rw-r--r-- | tools/preproc/preproc.cpp | 70 | ||||
| -rw-r--r-- | tools/preproc/preproc.h | 4 | ||||
| -rw-r--r-- | tools/preproc/string_parser.cpp | 355 | ||||
| -rw-r--r-- | tools/preproc/string_parser.h | 55 |
30 files changed, 5586 insertions, 7699 deletions
diff --git a/.gitignore b/.gitignore index ee1909710..842da01c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.exe *.o +*.i *.elf *.gba *.1bpp @@ -52,7 +52,7 @@ compare: $(ROM) @$(SHA1) rom.sha1 clean: - $(RM) $(ROM) $(ELF) $(OBJS) + rm -f $(ROM) $(ELF) $(OBJS) $(C_SRCS:%.c=%.i) find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} + include castform.mk @@ -76,8 +76,9 @@ src/m4a_2.o: CC1 := tools/agbcc/bin/old_agbcc src/m4a_4.o: CC1 := tools/agbcc/bin/old_agbcc $(C_OBJS): %.o : %.c - $(CPP) $(CPPFLAGS) $< | $(CC1) $(CFLAGS) -o $*.s - echo -e ".text\n\t.align\t2, 0\n" >> $*.s + @$(CPP) $(CPPFLAGS) $< -o $*.i + @$(PREPROC) $*.i charmap.txt | $(CC1) $(CFLAGS) -o $*.s + @echo -e ".text\n\t.align\t2, 0\n" >> $*.s $(AS) $(ASFLAGS) -o $@ $*.s %.o : dep = $(shell $(SCANINC) $*.s) diff --git a/asm/rom1.s b/asm/rom1.s index 3590d7bd8..5fca3c5ff 100644 --- a/asm/rom1.s +++ b/asm/rom1.s @@ -4,4742 +4,6 @@ .text - thumb_func_start ResetAllObjectData -ResetAllObjectData: @ 8000748 - push {r4,lr} - movs r0, 0 - movs r1, 0x80 - bl ResetSpriteRange - bl RemoveAllObjects - bl ClearObjectCopyRequests - bl rotscale_reset_all - bl FreeAllObjectTiles - ldr r1, _08000784 - movs r0, 0x40 - strb r0, [r1] - ldr r0, _08000788 - movs r4, 0 - strh r4, [r0] - movs r0, 0 - bl AllocObjectTiles - ldr r0, _0800078C - strh r4, [r0] - ldr r0, _08000790 - strh r4, [r0] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08000784: .4byte 0x030024d4 -_08000788: .4byte 0x030024d8 -_0800078C: .4byte 0x030024d0 -_08000790: .4byte 0x030027e0 - thumb_func_end ResetAllObjectData - - thumb_func_start CallObjectCallbacks -CallObjectCallbacks: @ 8000794 - push {r4-r7,lr} - movs r6, 0 - movs r7, 0x1 -_0800079A: - lsls r0, r6, 4 - adds r0, r6 - lsls r0, 2 - ldr r1, _080007DC - adds r4, r0, r1 - adds r5, r4, 0 - adds r5, 0x3E - ldrb r1, [r5] - adds r0, r7, 0 - ands r0, r1 - cmp r0, 0 - beq _080007CA - ldr r1, [r4, 0x1C] - adds r0, r4, 0 - bl _call_via_r1 - ldrb r1, [r5] - adds r0, r7, 0 - ands r0, r1 - cmp r0, 0 - beq _080007CA - adds r0, r4, 0 - bl AnimateObject -_080007CA: - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x3F - bls _0800079A - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080007DC: .4byte 0x02020004 - thumb_func_end CallObjectCallbacks - - thumb_func_start PrepareSpritesForOamLoad -PrepareSpritesForOamLoad: @ 80007E0 - push {r4,r5,lr} - bl UpdateObjectOamCoords - bl BuildObjectPriorityList - bl SortObjectsByPriority - ldr r5, _08000820 - ldr r0, _08000824 - adds r5, r0 - ldrb r0, [r5] - lsls r4, r0, 31 - lsrs r4, 31 - movs r1, 0x1 - orrs r0, r1 - strb r0, [r5] - bl sub_8000B44 - bl CopyTransformationMatricesToSprites - movs r2, 0x1 - ldrb r1, [r5] - movs r0, 0x2 - negs r0, r0 - ands r0, r1 - orrs r4, r0 - strb r4, [r5] - ldr r0, _08000828 - strb r2, [r0] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08000820: .4byte 0x03001770 -_08000824: .4byte 0x0000043d -_08000828: .4byte 0x030028f0 - thumb_func_end PrepareSpritesForOamLoad - - thumb_func_start UpdateObjectOamCoords -UpdateObjectOamCoords: @ 800082C - push {r4-r7,lr} - movs r4, 0 - ldr r7, _08000898 - ldr r0, _0800089C - adds r5, r0, 0 - ldr r6, _080008A0 -_08000838: - lsls r0, r4, 4 - adds r0, r4 - lsls r0, 2 - adds r3, r0, r7 - adds r0, r3, 0 - adds r0, 0x3E - ldrb r1, [r0] - movs r0, 0x5 - ands r0, r1 - cmp r0, 0x1 - bne _080008DE - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _080008AC - movs r2, 0x20 - ldrsh r1, [r3, r2] - movs r2, 0x24 - ldrsh r0, [r3, r2] - adds r1, r0 - adds r0, r3, 0 - adds r0, 0x28 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r1, r0 - ldr r0, _080008A4 - movs r2, 0 - ldrsh r0, [r0, r2] - adds r1, r0 - ands r1, r5 - ldrh r2, [r3, 0x2] - adds r0, r6, 0 - ands r0, r2 - orrs r0, r1 - strh r0, [r3, 0x2] - ldrh r1, [r3, 0x26] - ldrh r0, [r3, 0x22] - adds r1, r0 - adds r0, r3, 0 - adds r0, 0x29 - ldrb r0, [r0] - ldr r2, _080008A8 - adds r0, r1 - ldrb r2, [r2] - adds r0, r2 - b _080008DC - .align 2, 0 -_08000898: .4byte 0x02020004 -_0800089C: .4byte 0x000001ff -_080008A0: .4byte 0xfffffe00 -_080008A4: .4byte 0x030024d0 -_080008A8: .4byte 0x030027e0 -_080008AC: - movs r2, 0x20 - ldrsh r1, [r3, r2] - movs r2, 0x24 - ldrsh r0, [r3, r2] - adds r1, r0 - adds r0, r3, 0 - adds r0, 0x28 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r1, r0 - ands r1, r5 - ldrh r2, [r3, 0x2] - adds r0, r6, 0 - ands r0, r2 - orrs r0, r1 - strh r0, [r3, 0x2] - ldrh r1, [r3, 0x26] - ldrh r0, [r3, 0x22] - adds r1, r0 - adds r0, r3, 0 - adds r0, 0x29 - ldrb r0, [r0] - adds r0, r1 -_080008DC: - strb r0, [r3] -_080008DE: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x3F - bls _08000838 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end UpdateObjectOamCoords - - thumb_func_start BuildObjectPriorityList -BuildObjectPriorityList: @ 80008F0 - push {r4,lr} - movs r2, 0 - ldr r4, _08000928 - ldr r3, _0800092C -_080008F8: - lsls r0, r2, 4 - adds r0, r2 - lsls r0, 2 - adds r0, r4 - adds r1, r0, 0 - adds r1, 0x43 - ldrb r1, [r1] - ldrb r0, [r0, 0x5] - lsls r0, 28 - lsrs r0, 30 - lsls r0, 8 - orrs r1, r0 - lsls r0, r2, 1 - adds r0, r3 - strh r1, [r0] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x3F - bls _080008F8 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08000928: .4byte 0x02020004 -_0800092C: .4byte 0x02021148 - thumb_func_end BuildObjectPriorityList - - thumb_func_start SortObjectsByPriority -SortObjectsByPriority: @ 8000930 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - movs r0, 0x1 - mov r12, r0 - ldr r1, _080009F8 - mov r10, r1 - ldr r3, _080009FC - mov r9, r3 - ldr r6, _08000A00 - mov r8, r6 -_0800094C: - mov r5, r12 - mov r0, r12 - subs r0, 0x1 - add r0, r10 - ldrb r2, [r0] - lsls r0, r2, 4 - adds r0, r2 - lsls r0, 2 - ldr r7, _08000A04 - adds r3, r0, r7 - mov r0, r12 - add r0, r10 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r4, r0, r7 - lsls r2, 1 - ldr r0, _08000A08 - adds r2, r0 - ldrh r2, [r2] - str r2, [sp] - lsls r1, 1 - adds r1, r0 - ldrh r6, [r1] - ldrb r1, [r3] - ldrb r2, [r4] - adds r0, r1, 0 - cmp r0, 0x9F - ble _0800098E - add r0, r9 - lsls r0, 16 - lsrs r1, r0, 16 -_0800098E: - lsls r0, r2, 16 - asrs r0, 16 - cmp r0, 0x9F - ble _0800099C - add r0, r9 - lsls r0, 16 - lsrs r2, r0, 16 -_0800099C: - ldr r0, [r3] - mov r7, r8 - ands r0, r7 - cmp r0, r8 - bne _080009C0 - ldrb r0, [r3, 0x1] - lsrs r0, 6 - cmp r0, 0 - beq _080009B2 - cmp r0, 0x2 - bne _080009C0 -_080009B2: - lsls r0, r1, 16 - asrs r0, 16 - cmp r0, 0x80 - ble _080009C0 - add r0, r9 - lsls r0, 16 - lsrs r1, r0, 16 -_080009C0: - ldr r0, [r4] - mov r3, r8 - ands r0, r3 - cmp r0, r8 - bne _080009E4 - ldrb r0, [r4, 0x1] - lsrs r0, 6 - cmp r0, 0 - beq _080009D6 - cmp r0, 0x2 - bne _080009E4 -_080009D6: - lsls r0, r2, 16 - asrs r0, 16 - cmp r0, 0x80 - ble _080009E4 - add r0, r9 - lsls r0, 16 - lsrs r2, r0, 16 -_080009E4: - movs r7, 0x1 - add r12, r7 - cmp r5, 0 - beq _08000ACA - ldr r0, [sp] - cmp r0, r6 - bhi _08000A0C - cmp r0, r6 - bne _08000ACA - b _08000AC2 - .align 2, 0 -_080009F8: .4byte 0x03002410 -_080009FC: .4byte 0xffffff00 -_08000A00: .4byte 0xc0000300 -_08000A04: .4byte 0x02020004 -_08000A08: .4byte 0x02021148 -_08000A0C: - mov r1, r10 - adds r3, r5, r1 - ldrb r4, [r3] - subs r2, r5, 0x1 - adds r1, r2, r1 - ldrb r0, [r1] - strb r0, [r3] - strb r4, [r1] - lsls r2, 24 - lsrs r5, r2, 24 - subs r0, r5, 0x1 - add r0, r10 - ldrb r2, [r0] - lsls r0, r2, 4 - adds r0, r2 - lsls r0, 2 - ldr r6, _08000AE8 - adds r3, r0, r6 - mov r7, r10 - adds r0, r5, r7 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r4, r0, r6 - lsls r2, 1 - ldr r0, _08000AEC - adds r2, r0 - ldrh r2, [r2] - str r2, [sp] - lsls r1, 1 - adds r1, r0 - ldrh r6, [r1] - ldrb r1, [r3] - ldrb r2, [r4] - adds r0, r1, 0 - cmp r0, 0x9F - ble _08000A5E - add r0, r9 - lsls r0, 16 - lsrs r1, r0, 16 -_08000A5E: - lsls r0, r2, 16 - asrs r0, 16 - cmp r0, 0x9F - ble _08000A6C - add r0, r9 - lsls r0, 16 - lsrs r2, r0, 16 -_08000A6C: - ldr r0, [r3] - mov r7, r8 - ands r0, r7 - cmp r0, r8 - bne _08000A90 - ldrb r0, [r3, 0x1] - lsrs r0, 6 - cmp r0, 0 - beq _08000A82 - cmp r0, 0x2 - bne _08000A90 -_08000A82: - lsls r0, r1, 16 - asrs r0, 16 - cmp r0, 0x80 - ble _08000A90 - add r0, r9 - lsls r0, 16 - lsrs r1, r0, 16 -_08000A90: - ldr r0, [r4] - mov r3, r8 - ands r0, r3 - cmp r0, r8 - bne _08000AB4 - ldrb r0, [r4, 0x1] - lsrs r0, 6 - cmp r0, 0 - beq _08000AA6 - cmp r0, 0x2 - bne _08000AB4 -_08000AA6: - lsls r0, r2, 16 - asrs r0, 16 - cmp r0, 0x80 - ble _08000AB4 - add r0, r9 - lsls r0, 16 - lsrs r2, r0, 16 -_08000AB4: - cmp r5, 0 - beq _08000ACA - ldr r7, [sp] - cmp r7, r6 - bhi _08000A0C - cmp r7, r6 - bne _08000ACA -_08000AC2: - lsls r1, 16 - lsls r0, r2, 16 - cmp r1, r0 - blt _08000A0C -_08000ACA: - mov r1, r12 - lsls r0, r1, 24 - lsrs r0, 24 - mov r12, r0 - cmp r0, 0x3F - bhi _08000AD8 - b _0800094C -_08000AD8: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08000AE8: .4byte 0x02020004 -_08000AEC: .4byte 0x02021148 - thumb_func_end SortObjectsByPriority - - thumb_func_start CopyTransformationMatricesToSprites -CopyTransformationMatricesToSprites: @ 8000AF0 - push {r4-r6,lr} - movs r4, 0 - ldr r5, _08000B3C - ldr r6, _08000B40 -_08000AF8: - lsls r2, r4, 2 - lsls r0, r4, 5 - adds r0, r5 - lsls r3, r4, 3 - adds r3, r6 - ldrh r1, [r3] - adds r0, 0x42 - strh r1, [r0] - adds r0, r2, 0x1 - lsls r0, 3 - adds r0, r5 - ldrh r1, [r3, 0x2] - adds r0, 0x42 - strh r1, [r0] - adds r0, r2, 0x2 - lsls r0, 3 - adds r0, r5 - ldrh r1, [r3, 0x4] - adds r0, 0x42 - strh r1, [r0] - adds r2, 0x3 - lsls r2, 3 - adds r2, r5 - ldrh r0, [r3, 0x6] - adds r2, 0x42 - strh r0, [r2] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x1F - bls _08000AF8 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08000B3C: .4byte 0x03001770 -_08000B40: .4byte 0x030027f0 - thumb_func_end CopyTransformationMatricesToSprites - - thumb_func_start sub_8000B44 -sub_8000B44: @ 8000B44 - push {r4-r6,lr} - sub sp, 0x4 - movs r4, 0 - mov r0, sp - strb r4, [r0] -_08000B4E: - ldr r0, _08000BC8 - adds r0, r4, r0 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _08000BCC - adds r2, r0, r1 - adds r0, r2, 0 - adds r0, 0x3E - ldrb r1, [r0] - movs r0, 0x5 - ands r0, r1 - cmp r0, 0x1 - bne _08000B7A - adds r0, r2, 0 - mov r1, sp - bl AddSprite - lsls r0, 24 - cmp r0, 0 - bne _08000B84 -_08000B7A: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x3F - bls _08000B4E -_08000B84: - ldr r2, _08000BD0 - mov r0, sp - ldrb r0, [r0] - adds r1, r2, 0 - adds r1, 0x38 - strb r0, [r1] - ldr r1, _08000BD4 - lsls r0, 24 - lsrs r0, 24 - ldrb r3, [r1] - cmp r0, r3 - bcs _08000BC0 - adds r5, r2, 0 - mov r2, sp - ldr r0, _08000BD8 - ldr r3, [r0] - ldr r4, [r0, 0x4] -_08000BA6: - ldrb r0, [r2] - lsls r0, 3 - adds r0, r5 - str r3, [r0, 0x3C] - str r4, [r0, 0x40] - ldrb r0, [r2] - adds r0, 0x1 - strb r0, [r2] - lsls r0, 24 - lsrs r0, 24 - ldrb r6, [r1] - cmp r0, r6 - bcc _08000BA6 -_08000BC0: - add sp, 0x4 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08000BC8: .4byte 0x03002410 -_08000BCC: .4byte 0x02020004 -_08000BD0: .4byte 0x03001770 -_08000BD4: .4byte 0x030024d4 -_08000BD8: .4byte gDummyBaseOam - thumb_func_end sub_8000B44 - - thumb_func_start AddObjectToFront -AddObjectToFront: @ 8000BDC - push {r4-r7,lr} - sub sp, 0x4 - adds r7, r0, 0 - lsls r3, 24 - lsrs r4, r3, 24 - movs r3, 0 - ldr r0, _08000C18 - mov r12, r0 - lsls r5, r1, 16 - lsls r6, r2, 16 -_08000BF0: - lsls r0, r3, 4 - adds r0, r3 - lsls r0, 2 - add r0, r12 - adds r0, 0x3E - ldrb r0, [r0] - lsls r0, 31 - cmp r0, 0 - bne _08000C1C - str r4, [sp] - adds r0, r3, 0 - adds r1, r7, 0 - asrs r2, r5, 16 - asrs r3, r6, 16 - bl AddObject - lsls r0, 24 - lsrs r0, 24 - b _08000C28 - .align 2, 0 -_08000C18: .4byte 0x02020004 -_08000C1C: - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x3F - bls _08000BF0 - movs r0, 0x40 -_08000C28: - add sp, 0x4 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end AddObjectToFront - - thumb_func_start AddObjectToBack -AddObjectToBack: @ 8000C30 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - adds r7, r0, 0 - lsls r3, 24 - lsrs r6, r3, 24 - movs r3, 0x3F - ldr r0, _08000C7C - mov r8, r0 - movs r0, 0x1 - negs r0, r0 - mov r12, r0 - lsls r4, r1, 16 - lsls r5, r2, 16 -_08000C4E: - lsls r0, r3, 16 - asrs r1, r0, 16 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - add r0, r8 - adds r0, 0x3E - ldrb r0, [r0] - lsls r0, 31 - cmp r0, 0 - bne _08000C80 - lsls r0, r3, 24 - lsrs r0, 24 - str r6, [sp] - adds r1, r7, 0 - asrs r2, r4, 16 - asrs r3, r5, 16 - bl AddObject - lsls r0, 24 - lsrs r0, 24 - b _08000C8E - .align 2, 0 -_08000C7C: .4byte 0x02020004 -_08000C80: - subs r0, r1, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - asrs r0, 16 - cmp r0, r12 - bgt _08000C4E - movs r0, 0x40 -_08000C8E: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end AddObjectToBack - - thumb_func_start obj_add_empty_with_callback -obj_add_empty_with_callback: @ 8000C9C - push {r4-r6,lr} - adds r6, r0, 0 - ldr r0, _08000CD4 - movs r1, 0 - movs r2, 0 - movs r3, 0x1F - bl AddObjectToFront - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x40 - beq _08000CDC - ldr r4, _08000CD8 - lsls r1, r5, 4 - adds r1, r5 - lsls r1, 2 - adds r2, r1, r4 - adds r2, 0x3E - ldrb r0, [r2] - movs r3, 0x4 - orrs r0, r3 - strb r0, [r2] - adds r4, 0x1C - adds r1, r4 - str r6, [r1] - adds r0, r5, 0 - b _08000CDE - .align 2, 0 -_08000CD4: .4byte gUnknown_081E2914 -_08000CD8: .4byte 0x02020004 -_08000CDC: - movs r0, 0x40 -_08000CDE: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end obj_add_empty_with_callback - - thumb_func_start AddObject -AddObject: @ 8000CE4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - mov r8, r1 - adds r5, r2, 0 - adds r6, r3, 0 - ldr r4, [sp, 0x20] - lsls r0, 24 - lsrs r0, 24 - mov r10, r0 - lsls r5, 16 - lsrs r5, 16 - lsls r6, 16 - lsrs r6, 16 - lsls r4, 24 - lsrs r4, 24 - lsls r0, 4 - add r0, r10 - lsls r0, 2 - ldr r1, _08000DA8 - adds r7, r0, r1 - adds r0, r7, 0 - bl RemoveObject - adds r2, r7, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x1 - orrs r0, r1 - strb r0, [r2] - movs r0, 0x3F - adds r0, r7 - mov r9, r0 - ldrb r0, [r0] - movs r1, 0x4 - orrs r0, r1 - movs r1, 0x8 - orrs r0, r1 - movs r1, 0x40 - orrs r0, r1 - mov r1, r9 - strb r0, [r1] - adds r0, r7, 0 - adds r0, 0x43 - strb r4, [r0] - mov r1, r8 - ldr r0, [r1, 0x4] - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [r7] - str r1, [r7, 0x4] - mov r1, r8 - ldr r0, [r1, 0x8] - str r0, [r7, 0x8] - ldr r0, [r1, 0x10] - str r0, [r7, 0x10] - str r1, [r7, 0x14] - ldr r0, [r1, 0x14] - str r0, [r7, 0x1C] - strh r5, [r7, 0x20] - strh r6, [r7, 0x22] - ldrb r3, [r7, 0x1] - lsrs r1, r3, 6 - ldrb r2, [r7, 0x3] - lsrs r2, 6 - lsls r3, 30 - lsrs r3, 30 - adds r0, r7, 0 - bl CalcVecFromObjectCenterToObjectUpperLeft - mov r0, r8 - ldrh r1, [r0] - ldr r4, _08000DAC - lsrs r0, r4, 16 - cmp r1, r0 - bne _08000DE0 - mov r1, r8 - ldr r0, [r1, 0xC] - str r0, [r7, 0xC] - ldrh r0, [r0, 0x4] - lsrs r0, 5 - lsls r0, 24 - lsrs r0, 24 - bl AllocObjectTiles - lsls r0, 16 - lsrs r2, r0, 16 - asrs r0, 16 - asrs r1, r4, 16 - cmp r0, r1 - bne _08000DB0 - adds r0, r7, 0 - bl RemoveObject - movs r0, 0x40 - b _08000E28 - .align 2, 0 -_08000DA8: .4byte 0x02020004 -_08000DAC: .4byte 0xffff0000 -_08000DB0: - ldr r1, _08000DD8 - adds r0, r1, 0 - ands r2, r0 - ldrh r1, [r7, 0x4] - ldr r0, _08000DDC - ands r0, r1 - orrs r0, r2 - strh r0, [r7, 0x4] - mov r0, r9 - ldrb r1, [r0] - movs r0, 0x41 - negs r0, r0 - ands r0, r1 - mov r1, r9 - strb r0, [r1] - adds r1, r7, 0 - adds r1, 0x40 - movs r0, 0 - strh r0, [r1] - b _08000DF4 - .align 2, 0 -_08000DD8: .4byte 0x000003ff -_08000DDC: .4byte 0xfffffc00 -_08000DE0: - mov r1, r8 - ldrh r0, [r1] - bl GetObjectTileRangeStartByTag - adds r1, r7, 0 - adds r1, 0x40 - strh r0, [r1] - adds r0, r7, 0 - bl sub_80020D4 -_08000DF4: - ldrb r0, [r7, 0x1] - lsls r0, 30 - lsrs r0, 30 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08000E08 - adds r0, r7, 0 - bl obj_alloc_rotscale_entry -_08000E08: - mov r0, r8 - ldrh r1, [r0, 0x2] - ldr r0, _08000E38 - cmp r1, r0 - beq _08000E26 - mov r1, r8 - ldrh r0, [r1, 0x2] - bl IndexOfObjectPaletteTag - lsls r0, 4 - ldrb r2, [r7, 0x5] - movs r1, 0xF - ands r1, r2 - orrs r1, r0 - strb r1, [r7, 0x5] -_08000E26: - mov r0, r10 -_08000E28: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_08000E38: .4byte 0x0000ffff - thumb_func_end AddObject - - thumb_func_start AddObjectAndAnimateForOneFrame -AddObjectAndAnimateForOneFrame: @ 8000E3C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - mov r10, r0 - lsls r3, 24 - lsrs r3, 24 - mov r9, r3 - movs r3, 0 - ldr r5, _08000EAC - lsls r1, 16 - mov r12, r1 - lsls r2, 16 - mov r8, r2 -_08000E5C: - lsls r0, r3, 4 - adds r0, r3 - lsls r6, r0, 2 - adds r4, r6, r5 - adds r7, r4, 0 - adds r7, 0x3E - ldrb r0, [r7] - lsls r0, 31 - cmp r0, 0 - bne _08000EB4 - mov r0, r9 - str r0, [sp] - adds r0, r3, 0 - mov r1, r10 - mov r3, r12 - asrs r2, r3, 16 - mov r5, r8 - asrs r3, r5, 16 - bl AddObject - lsls r0, 24 - lsrs r0, 24 - adds r5, r0, 0 - cmp r5, 0x40 - beq _08000EBE - ldr r1, _08000EB0 - adds r0, r6, r1 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - ldrb r0, [r7] - lsls r0, 31 - cmp r0, 0 - beq _08000EA8 - adds r0, r4, 0 - bl AnimateObject -_08000EA8: - adds r0, r5, 0 - b _08000EC0 - .align 2, 0 -_08000EAC: .4byte 0x02020004 -_08000EB0: .4byte 0x02020020 -_08000EB4: - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x3F - bls _08000E5C -_08000EBE: - movs r0, 0x40 -_08000EC0: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end AddObjectAndAnimateForOneFrame - - thumb_func_start RemoveObjectAndFreeTiles -RemoveObjectAndFreeTiles: @ 8000ED0 - push {r4-r7,lr} - adds r5, r0, 0 - adds r0, 0x3E - ldrb r1, [r0] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08000F2C - adds r0, r5, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - bne _08000F26 - ldr r0, [r5, 0xC] - ldrh r2, [r0, 0x4] - lsrs r2, 5 - ldrh r0, [r5, 0x4] - lsls r0, 22 - lsrs r1, r0, 22 - adds r4, r1, r2 - adds r3, r1, 0 - cmp r3, r4 - bcs _08000F26 - ldr r0, _08000F34 - mov r12, r0 - movs r6, 0x7 - movs r7, 0x1 -_08000F0A: - lsrs r2, r3, 3 - add r2, r12 - adds r0, r3, 0 - ands r0, r6 - adds r1, r7, 0 - lsls r1, r0 - ldrb r0, [r2] - bics r0, r1 - strb r0, [r2] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, r4 - bcc _08000F0A -_08000F26: - adds r0, r5, 0 - bl RemoveObject -_08000F2C: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08000F34: .4byte 0x03002450 - thumb_func_end RemoveObjectAndFreeTiles - - thumb_func_start ResetSpriteRange -ResetSpriteRange: @ 8000F38 - push {r4-r6,lr} - lsls r0, 24 - lsls r1, 24 - lsrs r4, r1, 24 - lsrs r3, r0, 24 - cmp r3, r4 - bcs _08000F60 - ldr r6, _08000F68 - ldr r5, _08000F6C -_08000F4A: - lsls r0, r3, 3 - adds r0, r6 - ldr r1, [r5] - ldr r2, [r5, 0x4] - str r1, [r0] - str r2, [r0, 0x4] - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, r4 - bcc _08000F4A -_08000F60: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08000F68: .4byte 0x030017ac -_08000F6C: .4byte gDummyBaseOam - thumb_func_end ResetSpriteRange - - thumb_func_start LoadOamFromSprites -LoadOamFromSprites: @ 8000F70 - push {lr} - ldr r2, _08000F94 - ldr r1, _08000F98 - adds r0, r2, r1 - ldrb r1, [r0] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - bne _08000F90 - adds r0, r2, 0 - adds r0, 0x3C - movs r1, 0xE0 - lsls r1, 19 - ldr r2, _08000F9C - bl CpuSet -_08000F90: - pop {r0} - bx r0 - .align 2, 0 -_08000F94: .4byte 0x03001770 -_08000F98: .4byte 0x0000043d -_08000F9C: .4byte 0x04000100 - thumb_func_end LoadOamFromSprites - - thumb_func_start ClearObjectCopyRequests -ClearObjectCopyRequests: @ 8000FA0 - push {r4,r5,lr} - ldr r0, _08000FD4 - movs r1, 0 - strb r1, [r0] - ldr r0, _08000FD8 - strb r1, [r0] - movs r2, 0 - ldr r4, _08000FDC - movs r3, 0 - adds r5, r4, 0x4 -_08000FB4: - lsls r0, r2, 1 - adds r0, r2 - lsls r0, 2 - adds r1, r0, r4 - str r3, [r1] - adds r0, r5 - str r3, [r0] - strh r3, [r1, 0x8] - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x3F - bls _08000FB4 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08000FD4: .4byte 0x030028f0 -_08000FD8: .4byte 0x030024dc -_08000FDC: .4byte 0x030024e0 - thumb_func_end ClearObjectCopyRequests - - thumb_func_start ResetSpriteTransformationMatrices -ResetSpriteTransformationMatrices: @ 8000FE0 - push {r4,lr} - movs r1, 0 - ldr r4, _08001008 - movs r3, 0 - movs r2, 0x80 - lsls r2, 1 -_08000FEC: - lsls r0, r1, 3 - adds r0, r4 - strh r2, [r0] - strh r3, [r0, 0x2] - strh r3, [r0, 0x4] - strh r2, [r0, 0x6] - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x1F - bls _08000FEC - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08001008: .4byte 0x030027f0 - thumb_func_end ResetSpriteTransformationMatrices - - thumb_func_start SetSpriteTransformationMatrix -SetSpriteTransformationMatrix: @ 800100C - push {r4,r5,lr} - ldr r5, [sp, 0xC] - lsls r0, 24 - ldr r4, _08001028 - lsrs r0, 21 - adds r0, r4 - strh r1, [r0] - strh r2, [r0, 0x2] - strh r3, [r0, 0x4] - strh r5, [r0, 0x6] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08001028: .4byte 0x030027f0 - thumb_func_end SetSpriteTransformationMatrix - - thumb_func_start RemoveObject -RemoveObject: @ 800102C - push {lr} - ldr r1, _0800103C - movs r2, 0x44 - bl memcpy - pop {r0} - bx r0 - .align 2, 0 -_0800103C: .4byte gUnknown_081E28B4 - thumb_func_end RemoveObject - - thumb_func_start CalcVecFromObjectCenterToObjectUpperLeft -CalcVecFromObjectCenterToObjectUpperLeft: @ 8001040 - push {r4-r6,lr} - adds r6, r0, 0 - lsls r1, 24 - lsls r2, 24 - lsls r3, 24 - lsrs r3, 24 - ldr r4, _08001080 - lsrs r2, 23 - lsrs r1, 21 - adds r2, r1 - adds r0, r2, r4 - ldrb r5, [r0] - adds r4, 0x1 - adds r2, r4 - ldrb r1, [r2] - movs r0, 0x2 - ands r3, r0 - cmp r3, 0 - beq _0800106E - lsls r0, r5, 25 - lsrs r5, r0, 24 - lsls r0, r1, 25 - lsrs r1, r0, 24 -_0800106E: - adds r0, r6, 0 - adds r0, 0x28 - strb r5, [r0] - adds r0, 0x1 - strb r1, [r0] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08001080: .4byte gUnknown_081E2899 - thumb_func_end CalcVecFromObjectCenterToObjectUpperLeft - - thumb_func_start AllocObjectTiles -AllocObjectTiles: @ 8001084 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0 - bne _080010DA - ldr r0, _080010C8 - ldrh r3, [r0] - ldr r0, _080010CC - cmp r3, r0 - bhi _080010C2 - ldr r7, _080010D0 - movs r6, 0x7 - adds r4, r0, 0 - movs r5, 0x1 -_080010A6: - lsrs r2, r3, 3 - adds r2, r7 - adds r0, r3, 0 - ands r0, r6 - adds r1, r5, 0 - lsls r1, r0 - ldrb r0, [r2] - bics r0, r1 - strb r0, [r2] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, r4 - bls _080010A6 -_080010C2: - movs r0, 0 - b _0800118C - .align 2, 0 -_080010C8: .4byte 0x030024d8 -_080010CC: .4byte 0x000003ff -_080010D0: .4byte 0x03002450 -_080010D4: - movs r0, 0x1 - negs r0, r0 - b _0800118C -_080010DA: - ldr r0, _08001198 - ldrh r3, [r0] - ldr r0, _0800119C - mov r9, r0 - movs r7, 0x7 - movs r6, 0x1 -_080010E6: - lsrs r0, r3, 3 - add r0, r9 - ldrb r1, [r0] - adds r0, r3, 0 - ands r0, r7 - asrs r1, r0 - ands r1, r6 - cmp r1, 0 - beq _0800111A - movs r5, 0x80 - lsls r5, 3 - ldr r2, _0800119C -_080010FE: - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, r5 - beq _080010D4 - lsrs r0, 19 - adds r0, r2 - ldrb r1, [r0] - adds r0, r3, 0 - ands r0, r7 - asrs r1, r0 - ands r1, r6 - cmp r1, 0 - bne _080010FE -_0800111A: - mov r8, r3 - movs r2, 0x1 - cmp r2, r4 - beq _08001154 - movs r1, 0x80 - lsls r1, 3 - mov r12, r1 - ldr r5, _0800119C -_0800112A: - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, r12 - beq _080010D4 - lsrs r0, 19 - adds r0, r5 - ldrb r1, [r0] - adds r0, r3, 0 - ands r0, r7 - asrs r1, r0 - ands r1, r6 - cmp r1, 0 - bne _08001150 - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, r4 - bne _0800112A -_08001150: - cmp r2, r4 - bne _080010E6 -_08001154: - mov r1, r8 - lsls r0, r1, 16 - lsrs r3, r0, 16 - asrs r1, r0, 16 - adds r1, r4, r1 - adds r6, r0, 0 - cmp r3, r1 - bge _0800118A - ldr r0, _0800119C - mov r8, r0 - movs r7, 0x7 - adds r4, r1, 0 - movs r5, 0x1 -_0800116E: - lsrs r2, r3, 3 - add r2, r8 - adds r1, r3, 0 - ands r1, r7 - adds r0, r5, 0 - lsls r0, r1 - ldrb r1, [r2] - orrs r0, r1 - strb r0, [r2] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, r4 - blt _0800116E -_0800118A: - asrs r0, r6, 16 -_0800118C: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_08001198: .4byte 0x030024d8 -_0800119C: .4byte 0x03002450 - thumb_func_end AllocObjectTiles - - thumb_func_start Unused_ObjectTileAllocationBitArrayOp -Unused_ObjectTileAllocationBitArrayOp: @ 80011A0 - push {r4-r6,lr} - lsls r0, 16 - lsrs r2, r0, 16 - lsls r1, 24 - lsrs r1, 24 - lsrs r0, 19 - lsls r0, 24 - lsrs r3, r0, 24 - adds r6, r3, 0 - movs r0, 0x7 - ands r2, r0 - adds r4, r2, 0 - movs r5, 0 - cmp r1, 0 - bne _080011D8 - movs r0, 0x1 - lsls r0, r2 - mvns r0, r0 - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, _080011D4 - adds r0, r3, r0 - ldrb r1, [r0] - ands r2, r1 - strb r2, [r0] - b _08001204 - .align 2, 0 -_080011D4: .4byte 0x03002450 -_080011D8: - cmp r1, 0x1 - bne _080011F4 - lsls r1, r2 - lsls r0, r1, 24 - lsrs r2, r0, 24 - ldr r0, _080011F0 - adds r0, r3, r0 - ldrb r1, [r0] - orrs r2, r1 - strb r2, [r0] - b _08001204 - .align 2, 0 -_080011F0: .4byte 0x03002450 -_080011F4: - movs r0, 0x80 - lsls r0, 17 - lsls r0, r4 - lsrs r5, r0, 24 - ldr r0, _0800120C - adds r0, r6, r0 - ldrb r0, [r0] - ands r5, r0 -_08001204: - adds r0, r5, 0 - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_0800120C: .4byte 0x03002450 - thumb_func_end Unused_ObjectTileAllocationBitArrayOp - - thumb_func_start nullsub_2 -nullsub_2: @ 8001210 - bx lr - thumb_func_end nullsub_2 - - thumb_func_start ProcessObjectCopyRequests -ProcessObjectCopyRequests: @ 8001214 - push {r4-r7,lr} - ldr r0, _08001264 - ldrb r0, [r0] - cmp r0, 0 - beq _0800125C - movs r4, 0 - ldr r1, _08001268 - ldrb r0, [r1] - cmp r0, 0 - beq _08001256 - ldr r6, _0800126C - adds r7, r6, 0x4 - adds r5, r1, 0 -_0800122E: - lsls r1, r4, 1 - adds r1, r4 - lsls r1, 2 - adds r2, r1, r6 - ldr r0, [r2] - adds r1, r7 - ldr r1, [r1] - ldrh r2, [r2, 0x8] - lsrs r2, 1 - bl CpuSet - ldrb r1, [r5] - subs r1, 0x1 - strb r1, [r5] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - lsls r1, 24 - cmp r1, 0 - bne _0800122E -_08001256: - ldr r1, _08001264 - movs r0, 0 - strb r0, [r1] -_0800125C: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08001264: .4byte 0x030028f0 -_08001268: .4byte 0x030024dc -_0800126C: .4byte 0x030024e0 - thumb_func_end ProcessObjectCopyRequests - - thumb_func_start AddPicToObjectCopyRequests -AddPicToObjectCopyRequests: @ 8001270 - push {r4-r6,lr} - adds r5, r2, 0 - lsls r0, 16 - lsrs r2, r0, 16 - lsls r1, 16 - lsrs r6, r1, 16 - ldr r4, _080012C8 - ldrb r0, [r4] - cmp r0, 0x3F - bhi _080012C0 - ldr r3, _080012CC - adds r1, r0, 0 - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - lsls r2, 3 - adds r2, r5 - ldr r1, [r2] - str r1, [r0] - ldrb r0, [r4] - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 2 - adds r0, r3, 0x4 - adds r1, r0 - lsls r0, r6, 5 - ldr r5, _080012D0 - adds r0, r5 - str r0, [r1] - ldrb r1, [r4] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - ldrh r1, [r2, 0x4] - strh r1, [r0, 0x8] - ldrb r0, [r4] - adds r0, 0x1 - strb r0, [r4] -_080012C0: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080012C8: .4byte 0x030024dc -_080012CC: .4byte 0x030024e0 -_080012D0: .4byte 0x06010000 - thumb_func_end AddPicToObjectCopyRequests - - thumb_func_start AddTilesToObjectCopyRequests -AddTilesToObjectCopyRequests: @ 80012D4 - push {r4-r6,lr} - adds r4, r0, 0 - adds r5, r1, 0 - lsls r2, 16 - lsrs r6, r2, 16 - ldr r3, _0800131C - ldrb r0, [r3] - cmp r0, 0x3F - bhi _08001314 - ldr r2, _08001320 - adds r1, r0, 0 - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - str r4, [r0] - ldrb r1, [r3] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r1, r2, 0x4 - adds r0, r1 - str r5, [r0] - ldrb r1, [r3] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - strh r6, [r0, 0x8] - ldrb r0, [r3] - adds r0, 0x1 - strb r0, [r3] -_08001314: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0800131C: .4byte 0x030024dc -_08001320: .4byte 0x030024e0 - thumb_func_end AddTilesToObjectCopyRequests - - thumb_func_start Unused_CopyFromObjects -Unused_CopyFromObjects: @ 8001324 - push {r4,lr} - adds r1, r0, 0 - ldr r3, _08001344 - movs r2, 0 - ldr r4, _08001348 -_0800132E: - ldrb r0, [r3] - strb r0, [r1] - adds r1, 0x1 - adds r3, 0x1 - adds r2, 0x1 - cmp r2, r4 - bls _0800132E - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08001344: .4byte 0x02020004 -_08001348: .4byte 0x000010ff - thumb_func_end Unused_CopyFromObjects - - thumb_func_start Unused_CopyToObjects -Unused_CopyToObjects: @ 800134C - push {r4,lr} - adds r1, r0, 0 - ldr r3, _0800136C - movs r2, 0 - ldr r4, _08001370 -_08001356: - ldrb r0, [r1] - strb r0, [r3] - adds r1, 0x1 - adds r3, 0x1 - adds r2, 0x1 - cmp r2, r4 - bls _08001356 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0800136C: .4byte 0x02020004 -_08001370: .4byte 0x000010ff - thumb_func_end Unused_CopyToObjects - - thumb_func_start RemoveAllObjects -RemoveAllObjects: @ 8001374 - push {r4,r5,lr} - movs r4, 0 -_08001378: - lsls r0, r4, 4 - adds r0, r4 - lsls r0, 2 - ldr r5, _080013AC - adds r0, r5 - bl RemoveObject - ldr r0, _080013B0 - adds r0, r4, r0 - strb r4, [r0] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x3F - bls _08001378 - lsls r0, r4, 4 - adds r0, r4 - lsls r0, 2 - adds r0, r5 - bl RemoveObject - bl sub_814A590 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080013AC: .4byte 0x02020004 -_080013B0: .4byte 0x03002410 - thumb_func_end RemoveAllObjects - - thumb_func_start FreeObjectTiles -FreeObjectTiles: @ 80013B4 - push {lr} - ldr r2, [r0, 0x14] - ldrh r1, [r2] - ldr r0, _080013CC - cmp r1, r0 - beq _080013C6 - adds r0, r1, 0 - bl FreeObjectTilesByTag -_080013C6: - pop {r0} - bx r0 - .align 2, 0 -_080013CC: .4byte 0x0000ffff - thumb_func_end FreeObjectTiles - - thumb_func_start FreeObjectPalette -FreeObjectPalette: @ 80013D0 - push {lr} - ldr r0, [r0, 0x14] - ldrh r0, [r0, 0x2] - bl FreeObjectPaletteByTag - pop {r0} - bx r0 - thumb_func_end FreeObjectPalette - - thumb_func_start obj_free_rotscale_entry -obj_free_rotscale_entry: @ 80013E0 - push {r4,lr} - adds r4, r0, 0 - ldrb r0, [r4, 0x1] - lsls r0, 30 - lsrs r0, 30 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08001406 - ldrb r0, [r4, 0x3] - lsls r0, 26 - lsrs r0, 27 - bl rotscale_free_entry - ldrb r1, [r4, 0x1] - movs r0, 0x4 - negs r0, r0 - ands r0, r1 - strb r0, [r4, 0x1] -_08001406: - pop {r4} - pop {r0} - bx r0 - thumb_func_end obj_free_rotscale_entry - - thumb_func_start RemoveObjectAndFreeResources -RemoveObjectAndFreeResources: @ 800140C - push {r4,lr} - adds r4, r0, 0 - bl FreeObjectTiles - adds r0, r4, 0 - bl FreeObjectPalette - adds r0, r4, 0 - bl obj_free_rotscale_entry - adds r0, r4, 0 - bl RemoveObjectAndFreeTiles - pop {r4} - pop {r0} - bx r0 - thumb_func_end RemoveObjectAndFreeResources - - thumb_func_start sub_800142C -sub_800142C: @ 800142C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0xC - str r0, [sp] - str r1, [sp, 0x4] - lsls r3, 16 - lsrs r6, r3, 16 - adds r3, r2, 0 - ldr r0, _080014F4 - mov r12, r0 - adds r0, 0x38 - ldrb r1, [r0] - lsls r2, r1, 3 - mov r0, r12 - adds r0, 0x3C - adds r4, r2, r0 - movs r0, 0x80 - ands r1, r0 - cmp r1, 0 - bne _080014E2 - ldrh r1, [r3] - adds r0, r1, 0x1 - lsls r0, 16 - cmp r0, 0 - beq _080014E2 - ldr r5, _080014F8 - ldrh r2, [r5] - str r2, [sp, 0x8] - ldrh r0, [r5, 0x4] - ands r0, r6 - lsls r0, 8 - mov r10, r0 - ldrh r7, [r5, 0x10] - ands r7, r6 - ldrh r0, [r5, 0x6] - mov r9, r0 - ldrh r0, [r5, 0xA] - ands r0, r6 - lsls r0, 4 - mov r8, r0 - mov r6, r12 -_08001484: - ldr r0, [sp, 0x8] - ands r0, r1 - ldr r2, [sp, 0x4] - adds r1, r2 - ldrh r2, [r5, 0x2] - ands r1, r2 - orrs r0, r1 - mov r1, r10 - orrs r0, r1 - strh r0, [r4] - ldrh r2, [r3, 0x2] - mov r0, r9 - ands r0, r2 - ldr r1, [sp] - adds r2, r1 - ldrh r1, [r5, 0x8] - ands r2, r1 - orrs r0, r2 - mov r2, r8 - orrs r0, r2 - strh r0, [r4, 0x2] - ldrh r2, [r3, 0x4] - ldrh r0, [r5, 0xC] - ands r0, r2 - ldr r1, [sp, 0x2C] - adds r2, r1 - ldrh r1, [r5, 0xE] - ands r2, r1 - orrs r0, r2 - orrs r0, r7 - strh r0, [r4, 0x4] - adds r4, 0x8 - adds r0, r6, 0 - adds r0, 0x38 - ldrb r1, [r0] - adds r1, 0x1 - strb r1, [r0] - adds r3, 0x6 - movs r0, 0x80 - ands r1, r0 - cmp r1, 0 - bne _080014E2 - ldrh r1, [r3] - adds r0, r1, 0x1 - lsls r0, 16 - cmp r0, 0 - bne _08001484 -_080014E2: - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080014F4: .4byte 0x03001770 -_080014F8: .4byte gUnknown_081E292C - thumb_func_end sub_800142C - - thumb_func_start AnimateObject -AnimateObject: @ 80014FC - push {r4,r5,lr} - adds r4, r0, 0 - ldr r2, _08001538 - adds r5, r4, 0 - adds r5, 0x3F - ldrb r1, [r5] - movs r0, 0x4 - ands r0, r1 - adds r0, r2 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - ldr r0, _0800153C - ldrb r0, [r0] - cmp r0, 0 - bne _08001532 - ldr r0, _08001540 - ldrb r1, [r5] - lsls r1, 28 - lsrs r1, 31 - lsls r1, 2 - adds r1, r0 - ldr r1, [r1] - adds r0, r4, 0 - bl _call_via_r1 -_08001532: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08001538: .4byte gUnknown_081E2940 -_0800153C: .4byte 0x020211c8 -_08001540: .4byte gUnknown_081E2948 - thumb_func_end AnimateObject - - thumb_func_start BeginObjectImageAnim -BeginObjectImageAnim: @ 8001544 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - adds r4, r0, 0 - adds r3, r4, 0 - adds r3, 0x2B - movs r2, 0 - strb r2, [r3] - adds r5, r4, 0 - adds r5, 0x3F - ldrb r1, [r5] - movs r0, 0x11 - negs r0, r0 - ands r0, r1 - strb r0, [r5] - adds r0, r4, 0 - adds r0, 0x2D - strb r2, [r0] - adds r2, r4, 0 - adds r2, 0x2A - ldrb r1, [r2] - ldr r0, [r4, 0x8] - lsls r1, 2 - adds r1, r0 - ldrb r0, [r3] - ldr r1, [r1] - lsls r0, 2 - adds r0, r1 - ldrh r0, [r0] - mov r9, r0 - lsls r0, 16 - mov r8, r0 - asrs r1, r0, 16 - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _08001628 - ldrb r1, [r5] - subs r0, 0x4 - ands r0, r1 - strb r0, [r5] - ldrb r1, [r2] - ldr r0, [r4, 0x8] - lsls r1, 2 - adds r1, r0 - ldrb r0, [r3] - ldr r1, [r1] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - lsls r1, r0, 10 - lsrs r3, r1, 26 - lsls r1, r0, 9 - lsrs r7, r1, 31 - lsls r0, 8 - lsrs r6, r0, 31 - cmp r3, 0 - beq _080015C0 - subs r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 -_080015C0: - adds r2, r4, 0 - adds r2, 0x2C - movs r0, 0x3F - ands r3, r0 - ldrb r1, [r2] - subs r0, 0x7F - ands r0, r1 - orrs r0, r3 - strb r0, [r2] - ldrb r0, [r4, 0x1] - lsls r0, 30 - lsrs r0, 30 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - bne _080015EA - adds r0, r4, 0 - adds r1, r7, 0 - adds r2, r6, 0 - bl obj_set_horizonal_and_vertical_flip -_080015EA: - ldrb r1, [r5] - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - beq _08001618 - adds r0, r4, 0 - adds r0, 0x40 - ldrh r1, [r0] - add r1, r9 - ldr r2, _08001610 - adds r0, r2, 0 - ands r1, r0 - ldrh r2, [r4, 0x4] - ldr r0, _08001614 - ands r0, r2 - orrs r0, r1 - strh r0, [r4, 0x4] - b _08001628 - .align 2, 0 -_08001610: .4byte 0x000003ff -_08001614: .4byte 0xfffffc00 -_08001618: - mov r1, r8 - lsrs r0, r1, 16 - ldrh r1, [r4, 0x4] - lsls r1, 22 - lsrs r1, 22 - ldr r2, [r4, 0xC] - bl AddPicToObjectCopyRequests -_08001628: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end BeginObjectImageAnim - - thumb_func_start ContinueObjectImageAnim -ContinueObjectImageAnim: @ 8001634 - push {r4,lr} - adds r4, r0, 0 - adds r0, 0x2C - ldrb r1, [r0] - movs r0, 0x3F - ands r0, r1 - cmp r0, 0 - beq _08001684 - adds r0, r4, 0 - bl obj_anim_image_delay_progress - adds r0, r4, 0 - adds r0, 0x2A - ldrb r1, [r0] - ldr r0, [r4, 0x8] - lsls r1, 2 - adds r1, r0 - adds r0, r4, 0 - adds r0, 0x2B - ldrb r0, [r0] - ldr r1, [r1] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - lsls r1, r0, 9 - lsrs r3, r1, 31 - lsls r0, 8 - lsrs r2, r0, 31 - ldrb r0, [r4, 0x1] - lsls r0, 30 - lsrs r0, 30 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - bne _080016CA - adds r0, r4, 0 - adds r1, r3, 0 - bl obj_set_horizonal_and_vertical_flip - b _080016CA -_08001684: - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - bne _080016CA - adds r2, r4, 0 - adds r2, 0x2B - ldrb r0, [r2] - adds r0, 0x1 - strb r0, [r2] - adds r0, r4, 0 - adds r0, 0x2A - ldrb r0, [r0] - ldr r1, [r4, 0x8] - lsls r0, 2 - adds r0, r1 - ldrb r1, [r2] - ldr r0, [r0] - lsls r1, 2 - adds r1, r0 - movs r2, 0x3 - movs r3, 0 - ldrsh r0, [r1, r3] - cmp r0, 0 - bge _080016BA - adds r0, 0x3 - lsls r0, 16 - lsrs r2, r0, 16 -_080016BA: - ldr r0, _080016D0 - lsls r1, r2, 16 - asrs r1, 14 - adds r1, r0 - ldr r1, [r1] - adds r0, r4, 0 - bl _call_via_r1 -_080016CA: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080016D0: .4byte gUnknown_081E2950 - thumb_func_end ContinueObjectImageAnim - - thumb_func_start ImageAnimCmd_frame -ImageAnimCmd_frame: @ 80016D4 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r4, r0, 0 - adds r0, 0x2A - ldrb r1, [r0] - ldr r0, [r4, 0x8] - lsls r1, 2 - adds r1, r0 - adds r0, r4, 0 - adds r0, 0x2B - ldrb r0, [r0] - ldr r1, [r1] - lsls r0, 2 - adds r0, r1 - ldrh r7, [r0] - mov r8, r7 - ldr r0, [r0] - lsls r1, r0, 10 - lsrs r3, r1, 26 - lsls r1, r0, 9 - lsrs r6, r1, 31 - lsls r0, 8 - lsrs r5, r0, 31 - cmp r3, 0 - beq _0800170E - subs r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 -_0800170E: - adds r2, r4, 0 - adds r2, 0x2C - movs r0, 0x3F - ands r3, r0 - ldrb r1, [r2] - subs r0, 0x7F - ands r0, r1 - orrs r0, r3 - strb r0, [r2] - ldrb r0, [r4, 0x1] - lsls r0, 30 - lsrs r0, 30 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - bne _08001738 - adds r0, r4, 0 - adds r1, r6, 0 - adds r2, r5, 0 - bl obj_set_horizonal_and_vertical_flip -_08001738: - adds r0, r4, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - beq _08001768 - adds r0, r4, 0 - adds r0, 0x40 - ldrh r1, [r0] - adds r1, r7 - ldr r2, _08001760 - adds r0, r2, 0 - ands r1, r0 - ldrh r2, [r4, 0x4] - ldr r0, _08001764 - ands r0, r2 - orrs r0, r1 - strh r0, [r4, 0x4] - b _08001776 - .align 2, 0 -_08001760: .4byte 0x000003ff -_08001764: .4byte 0xfffffc00 -_08001768: - mov r0, r8 - ldrh r1, [r4, 0x4] - lsls r1, 22 - lsrs r1, 22 - ldr r2, [r4, 0xC] - bl AddPicToObjectCopyRequests -_08001776: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end ImageAnimCmd_frame - - thumb_func_start sub_8001780 -sub_8001780: @ 8001780 - adds r2, r0, 0 - adds r2, 0x2B - ldrb r1, [r2] - subs r1, 0x1 - strb r1, [r2] - adds r0, 0x3F - ldrb r1, [r0] - movs r2, 0x10 - orrs r1, r2 - strb r1, [r0] - bx lr - thumb_func_end sub_8001780 - - thumb_func_start ImageAnimCmd_jump -ImageAnimCmd_jump: @ 8001798 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r4, r0, 0 - adds r3, r4, 0 - adds r3, 0x2A - ldrb r1, [r3] - ldr r0, [r4, 0x8] - lsls r1, 2 - adds r1, r0 - adds r2, r4, 0 - adds r2, 0x2B - ldrb r0, [r2] - ldr r1, [r1] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - lsls r0, 10 - lsrs r0, 26 - strb r0, [r2] - ldrb r0, [r3] - ldr r1, [r4, 0x8] - lsls r0, 2 - adds r0, r1 - ldrb r1, [r2] - ldr r0, [r0] - lsls r1, 2 - adds r1, r0 - ldrh r7, [r1] - mov r8, r7 - ldr r0, [r1] - lsls r1, r0, 10 - lsrs r3, r1, 26 - lsls r1, r0, 9 - lsrs r6, r1, 31 - lsls r0, 8 - lsrs r5, r0, 31 - cmp r3, 0 - beq _080017EC - subs r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 -_080017EC: - adds r2, r4, 0 - adds r2, 0x2C - movs r0, 0x3F - ands r3, r0 - ldrb r1, [r2] - subs r0, 0x7F - ands r0, r1 - orrs r0, r3 - strb r0, [r2] - ldrb r0, [r4, 0x1] - lsls r0, 30 - lsrs r0, 30 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - bne _08001816 - adds r0, r4, 0 - adds r1, r6, 0 - adds r2, r5, 0 - bl obj_set_horizonal_and_vertical_flip -_08001816: - adds r0, r4, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - beq _08001848 - adds r0, r4, 0 - adds r0, 0x40 - ldrh r1, [r0] - adds r1, r7 - ldr r2, _08001840 - adds r0, r2, 0 - ands r1, r0 - ldrh r2, [r4, 0x4] - ldr r0, _08001844 - ands r0, r2 - orrs r0, r1 - strh r0, [r4, 0x4] - b _08001856 - .align 2, 0 -_08001840: .4byte 0x000003ff -_08001844: .4byte 0xfffffc00 -_08001848: - mov r0, r8 - ldrh r1, [r4, 0x4] - lsls r1, 22 - lsrs r1, 22 - ldr r2, [r4, 0xC] - bl AddPicToObjectCopyRequests -_08001856: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end ImageAnimCmd_jump - - thumb_func_start ImageAnimCmd_loop -ImageAnimCmd_loop: @ 8001860 - push {lr} - adds r1, r0, 0 - adds r0, 0x2D - ldrb r0, [r0] - cmp r0, 0 - beq _08001874 - adds r0, r1, 0 - bl ContinueImageAnimLoop - b _0800187A -_08001874: - adds r0, r1, 0 - bl BeginImageAnimLoop -_0800187A: - pop {r0} - bx r0 - thumb_func_end ImageAnimCmd_loop - - thumb_func_start BeginImageAnimLoop -BeginImageAnimLoop: @ 8001880 - push {r4,lr} - adds r4, r0, 0 - adds r0, 0x2A - ldrb r1, [r0] - ldr r0, [r4, 0x8] - lsls r1, 2 - adds r1, r0 - adds r0, r4, 0 - adds r0, 0x2B - ldrb r0, [r0] - ldr r1, [r1] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - lsls r0, 10 - lsrs r0, 26 - adds r1, r4, 0 - adds r1, 0x2D - strb r0, [r1] - adds r0, r4, 0 - bl JumpToTopOfImageAnimLoop - adds r0, r4, 0 - bl ContinueObjectImageAnim - pop {r4} - pop {r0} - bx r0 - thumb_func_end BeginImageAnimLoop - - thumb_func_start ContinueImageAnimLoop -ContinueImageAnimLoop: @ 80018B8 - push {r4,lr} - adds r4, r0, 0 - adds r1, r4, 0 - adds r1, 0x2D - ldrb r0, [r1] - subs r0, 0x1 - strb r0, [r1] - adds r0, r4, 0 - bl JumpToTopOfImageAnimLoop - adds r0, r4, 0 - bl ContinueObjectImageAnim - pop {r4} - pop {r0} - bx r0 - thumb_func_end ContinueImageAnimLoop - - thumb_func_start JumpToTopOfImageAnimLoop -JumpToTopOfImageAnimLoop: @ 80018D8 - push {r4-r7,lr} - mov r12, r0 - adds r0, 0x2D - ldrb r0, [r0] - cmp r0, 0 - beq _08001944 - mov r3, r12 - adds r3, 0x2B - ldrb r0, [r3] - subs r0, 0x1 - strb r0, [r3] - mov r5, r12 - adds r5, 0x2A - ldrb r1, [r5] - mov r2, r12 - ldr r0, [r2, 0x8] - lsls r1, 2 - adds r1, r0 - ldrb r0, [r3] - ldr r1, [r1] - lsls r0, 2 - adds r0, r1 - subs r0, 0x4 - movs r7, 0 - ldrsh r0, [r0, r7] - movs r1, 0x3 - negs r1, r1 - adds r4, r3, 0 - cmp r0, r1 - beq _0800193E - adds r6, r1, 0 - adds r2, r4, 0 -_08001918: - ldrb r0, [r2] - cmp r0, 0 - beq _0800193E - subs r0, 0x1 - strb r0, [r3] - ldrb r1, [r5] - mov r7, r12 - ldr r0, [r7, 0x8] - lsls r1, 2 - adds r1, r0 - ldrb r0, [r2] - ldr r1, [r1] - lsls r0, 2 - adds r0, r1 - subs r0, 0x4 - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, r6 - bne _08001918 -_0800193E: - ldrb r0, [r4] - subs r0, 0x1 - strb r0, [r4] -_08001944: - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end JumpToTopOfImageAnimLoop - - thumb_func_start sub_800194C -sub_800194C: @ 800194C - push {r4-r6,lr} - sub sp, 0x8 - adds r6, r0, 0 - ldrb r0, [r6, 0x1] - lsls r0, 30 - lsrs r0, 30 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080019B6 - ldr r0, [r6, 0x10] - ldr r0, [r0] - movs r2, 0 - ldrsh r1, [r0, r2] - ldr r0, _080019C0 - cmp r1, r0 - beq _080019B6 - adds r0, r6, 0 - bl obj_get_rotscale_entry_index - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - adds r0, r4, 0 - bl rotscale_reset_half - mov r5, sp - adds r0, r4, 0 - adds r1, r6, 0 - mov r2, sp - bl rotscale_load_frame - adds r2, r6, 0 - adds r2, 0x3F - ldrb r1, [r2] - movs r0, 0x9 - negs r0, r0 - ands r0, r1 - movs r1, 0x21 - negs r1, r1 - ands r0, r1 - strb r0, [r2] - adds r0, r4, 0 - mov r1, sp - bl sub_8001F18 - ldr r1, _080019C4 - lsls r0, r4, 1 - adds r0, r4 - lsls r0, 2 - adds r0, r1 - ldrb r1, [r5, 0x5] - strb r1, [r0, 0x2] -_080019B6: - add sp, 0x8 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080019C0: .4byte 0x00007fff -_080019C4: .4byte 0x03000180 - thumb_func_end sub_800194C - - thumb_func_start sub_80019C8 -sub_80019C8: @ 80019C8 - push {r4,r5,lr} - adds r4, r0, 0 - ldrb r0, [r4, 0x1] - lsls r0, 30 - lsrs r0, 30 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08001A4E - adds r0, r4, 0 - bl obj_get_rotscale_entry_index - lsls r0, 24 - lsrs r2, r0, 24 - adds r5, r2, 0 - ldr r1, _08001A00 - lsls r0, r2, 1 - adds r0, r2 - lsls r0, 2 - adds r3, r0, r1 - ldrb r0, [r3, 0x2] - cmp r0, 0 - beq _08001A04 - adds r0, r2, 0 - adds r1, r4, 0 - bl sub_8001A60 - b _08001A4E - .align 2, 0 -_08001A00: .4byte 0x03000180 -_08001A04: - adds r0, r4, 0 - adds r0, 0x2C - ldrb r1, [r0] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08001A4E - ldrb r0, [r3, 0x1] - adds r0, 0x1 - strb r0, [r3, 0x1] - ldrb r0, [r3] - ldr r1, [r4, 0x10] - lsls r0, 2 - adds r0, r1 - ldrb r1, [r3, 0x1] - ldr r0, [r0] - lsls r1, 3 - adds r1, r0 - movs r2, 0x3 - movs r0, 0 - ldrsh r1, [r1, r0] - ldr r0, _08001A54 - cmp r1, r0 - ble _08001A3C - ldr r2, _08001A58 - adds r0, r1, r2 - lsls r0, 16 - lsrs r2, r0, 16 -_08001A3C: - ldr r0, _08001A5C - lsls r1, r2, 16 - asrs r1, 14 - adds r1, r0 - ldr r2, [r1] - adds r0, r5, 0 - adds r1, r4, 0 - bl _call_via_r2 -_08001A4E: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08001A54: .4byte 0x00007ffc -_08001A58: .4byte 0xffff8003 -_08001A5C: .4byte gUnknown_081E2960 - thumb_func_end sub_80019C8 - - thumb_func_start sub_8001A60 -sub_8001A60: @ 8001A60 - push {r4,r5,lr} - sub sp, 0x8 - adds r5, r1, 0 - lsls r0, 24 - lsrs r4, r0, 24 - adds r0, r5, 0 - adds r1, r4, 0 - bl obj_anim_rotscale_delay_progress - lsls r0, 24 - cmp r0, 0 - bne _08001A8A - adds r0, r4, 0 - adds r1, r5, 0 - mov r2, sp - bl rotscale_load_frame - adds r0, r4, 0 - mov r1, sp - bl rotscale_frame_apply_relative_and_sync -_08001A8A: - add sp, 0x8 - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_8001A60 - - thumb_func_start RotScalAnimCmd_loop -RotScalAnimCmd_loop: @ 8001A94 - push {lr} - adds r3, r1, 0 - lsls r0, 24 - lsrs r2, r0, 24 - ldr r1, _08001AB8 - lsls r0, r2, 1 - adds r0, r2 - lsls r0, 2 - adds r0, r1 - ldrb r0, [r0, 0x3] - cmp r0, 0 - beq _08001ABC - adds r0, r2, 0 - adds r1, r3, 0 - bl ContinueRotScalAnimLoop - b _08001AC4 - .align 2, 0 -_08001AB8: .4byte 0x03000180 -_08001ABC: - adds r0, r2, 0 - adds r1, r3, 0 - bl BeginRotScalAnimLoop -_08001AC4: - pop {r0} - bx r0 - thumb_func_end RotScalAnimCmd_loop - - thumb_func_start BeginRotScalAnimLoop -BeginRotScalAnimLoop: @ 8001AC8 - push {r4,lr} - adds r4, r1, 0 - lsls r0, 24 - lsrs r0, 24 - ldr r1, _08001B00 - lsls r3, r0, 1 - adds r3, r0 - lsls r3, 2 - adds r3, r1 - ldrb r2, [r3] - ldr r1, [r4, 0x10] - lsls r2, 2 - adds r2, r1 - ldrb r1, [r3, 0x1] - ldr r2, [r2] - lsls r1, 3 - adds r1, r2 - ldrh r1, [r1, 0x2] - strb r1, [r3, 0x3] - adds r1, r4, 0 - bl JumpToTopOfRotScalAnimLoop - adds r0, r4, 0 - bl sub_80019C8 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08001B00: .4byte 0x03000180 - thumb_func_end BeginRotScalAnimLoop - - thumb_func_start ContinueRotScalAnimLoop -ContinueRotScalAnimLoop: @ 8001B04 - push {r4,lr} - adds r4, r1, 0 - lsls r0, 24 - lsrs r0, 24 - ldr r2, _08001B30 - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - ldrb r2, [r1, 0x3] - subs r2, 0x1 - strb r2, [r1, 0x3] - adds r1, r4, 0 - bl JumpToTopOfRotScalAnimLoop - adds r0, r4, 0 - bl sub_80019C8 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08001B30: .4byte 0x03000180 - thumb_func_end ContinueRotScalAnimLoop - - thumb_func_start JumpToTopOfRotScalAnimLoop -JumpToTopOfRotScalAnimLoop: @ 8001B34 - push {r4-r7,lr} - mov r12, r1 - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, _08001B58 - lsls r3, r5, 1 - adds r0, r3, r5 - lsls r0, 2 - adds r2, r0, r1 - ldrb r0, [r2, 0x3] - adds r6, r1, 0 - cmp r0, 0 - beq _08001B94 - ldrb r0, [r2, 0x1] - subs r0, 0x1 - strb r0, [r2, 0x1] - adds r4, r3, 0 - b _08001B64 - .align 2, 0 -_08001B58: .4byte 0x03000180 -_08001B5C: - cmp r2, 0 - beq _08001B88 - subs r0, r2, 0x1 - strb r0, [r3, 0x1] -_08001B64: - adds r0, r4, r5 - lsls r0, 2 - adds r3, r0, r6 - ldrb r0, [r3] - mov r2, r12 - ldr r1, [r2, 0x10] - lsls r0, 2 - adds r0, r1 - ldrb r2, [r3, 0x1] - ldr r1, [r0] - lsls r0, r2, 3 - adds r0, r1 - subs r0, 0x8 - movs r7, 0 - ldrsh r1, [r0, r7] - ldr r0, _08001B9C - cmp r1, r0 - bne _08001B5C -_08001B88: - adds r1, r4, r5 - lsls r1, 2 - adds r1, r6 - ldrb r0, [r1, 0x1] - subs r0, 0x1 - strb r0, [r1, 0x1] -_08001B94: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08001B9C: .4byte 0x00007ffd - thumb_func_end JumpToTopOfRotScalAnimLoop - - thumb_func_start RotScalAnimCmd_jump -RotScalAnimCmd_jump: @ 8001BA0 - push {r4-r6,lr} - sub sp, 0x8 - adds r5, r0, 0 - lsls r5, 24 - lsrs r5, 24 - ldr r0, _08001BE8 - lsls r4, r5, 1 - adds r4, r5 - lsls r4, 2 - adds r4, r0 - ldrb r2, [r4] - ldr r0, [r1, 0x10] - lsls r2, 2 - adds r2, r0 - ldrb r0, [r4, 0x1] - ldr r2, [r2] - lsls r0, 3 - adds r0, r2 - ldrh r0, [r0, 0x2] - strb r0, [r4, 0x1] - mov r6, sp - adds r0, r5, 0 - mov r2, sp - bl rotscale_load_frame - adds r0, r5, 0 - mov r1, sp - bl sub_8001F18 - ldrb r0, [r6, 0x5] - strb r0, [r4, 0x2] - add sp, 0x8 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08001BE8: .4byte 0x03000180 - thumb_func_end RotScalAnimCmd_jump - - thumb_func_start RotScalAnimCmd_end -RotScalAnimCmd_end: @ 8001BEC - push {lr} - sub sp, 0x8 - lsls r0, 24 - lsrs r0, 24 - movs r2, 0 - movs r3, 0 - str r2, [sp] - str r3, [sp, 0x4] - adds r1, 0x3F - ldrb r2, [r1] - movs r3, 0x20 - orrs r2, r3 - strb r2, [r1] - ldr r2, _08001C24 - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - ldrb r2, [r1, 0x1] - subs r2, 0x1 - strb r2, [r1, 0x1] - mov r1, sp - bl rotscale_frame_apply_relative_and_sync - add sp, 0x8 - pop {r0} - bx r0 - .align 2, 0 -_08001C24: .4byte 0x03000180 - thumb_func_end RotScalAnimCmd_end - - thumb_func_start RotScalAnimCmd_frame -RotScalAnimCmd_frame: @ 8001C28 - push {r4,r5,lr} - sub sp, 0x8 - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - mov r5, sp - adds r0, r4, 0 - mov r2, sp - bl rotscale_load_frame - adds r0, r4, 0 - mov r1, sp - bl sub_8001F18 - ldr r1, _08001C5C - lsls r0, r4, 1 - adds r0, r4 - lsls r0, 2 - adds r0, r1 - ldrb r1, [r5, 0x5] - strb r1, [r0, 0x2] - add sp, 0x8 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08001C5C: .4byte 0x03000180 - thumb_func_end RotScalAnimCmd_frame - - thumb_func_start rotscale_set_indirect -rotscale_set_indirect: @ 8001C60 - lsls r0, 24 - ldr r2, _08001C7C - lsrs r0, 21 - adds r0, r2 - ldrh r2, [r1] - strh r2, [r0] - ldrh r2, [r1, 0x2] - strh r2, [r0, 0x2] - ldrh r2, [r1, 0x4] - strh r2, [r0, 0x4] - ldrh r1, [r1, 0x6] - strh r1, [r0, 0x6] - bx lr - .align 2, 0 -_08001C7C: .4byte 0x030027f0 - thumb_func_end rotscale_set_indirect - - thumb_func_start obj_get_rotscale_entry_index -obj_get_rotscale_entry_index: @ 8001C80 - push {lr} - adds r2, r0, 0 - movs r3, 0 - ldrb r0, [r2, 0x1] - lsls r0, 30 - lsrs r0, 30 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08001C9A - ldrb r0, [r2, 0x3] - lsls r0, 26 - lsrs r3, r0, 27 -_08001C9A: - adds r0, r3, 0 - pop {r1} - bx r1 - thumb_func_end obj_get_rotscale_entry_index - - thumb_func_start obj_set_horizonal_and_vertical_flip -obj_set_horizonal_and_vertical_flip: @ 8001CA0 - push {r4-r6,lr} - mov r6, r8 - push {r6} - lsls r1, 24 - lsrs r1, 24 - lsls r2, 24 - lsrs r2, 24 - ldrb r6, [r0, 0x3] - lsls r3, r6, 26 - lsrs r3, 27 - movs r4, 0x7 - ands r3, r4 - lsls r3, 1 - subs r4, 0x46 - mov r8, r4 - mov r5, r8 - ands r5, r6 - orrs r5, r3 - strb r5, [r0, 0x3] - lsls r4, r5, 26 - lsrs r4, 27 - movs r6, 0x3F - adds r6, r0 - mov r12, r6 - ldrb r3, [r6] - lsls r3, 31 - lsrs r3, 31 - eors r1, r3 - movs r6, 0x1 - ands r1, r6 - lsls r1, 3 - orrs r4, r1 - lsls r4, 1 - mov r3, r8 - ands r3, r5 - orrs r3, r4 - strb r3, [r0, 0x3] - lsls r4, r3, 26 - lsrs r4, 27 - mov r5, r12 - ldrb r1, [r5] - lsls r1, 30 - lsrs r1, 31 - eors r2, r1 - ands r2, r6 - lsls r2, 4 - orrs r4, r2 - lsls r4, 1 - mov r6, r8 - ands r3, r6 - orrs r3, r4 - strb r3, [r0, 0x3] - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end obj_set_horizonal_and_vertical_flip - - thumb_func_start rotscale_reset_half -rotscale_reset_half: @ 8001D14 - lsls r0, 24 - lsrs r0, 24 - ldr r2, _08001D2C - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - movs r0, 0 - strb r0, [r1, 0x1] - strb r0, [r1, 0x2] - strb r0, [r1, 0x3] - bx lr - .align 2, 0 -_08001D2C: .4byte 0x03000180 - thumb_func_end rotscale_reset_half - - thumb_func_start rotscale_reset_full_1 -rotscale_reset_full_1: @ 8001D30 - lsls r0, 24 - lsrs r0, 24 - ldr r3, _08001D54 - lsls r2, r0, 1 - adds r2, r0 - lsls r2, 2 - adds r2, r3 - movs r3, 0 - strb r1, [r2] - strb r3, [r2, 0x1] - strb r3, [r2, 0x2] - strb r3, [r2, 0x3] - movs r0, 0x80 - lsls r0, 1 - strh r0, [r2, 0x4] - strh r0, [r2, 0x6] - strh r3, [r2, 0x8] - bx lr - .align 2, 0 -_08001D54: .4byte 0x03000180 - thumb_func_end rotscale_reset_full_1 - - thumb_func_start rotscale_reset_full_2 -rotscale_reset_full_2: @ 8001D58 - lsls r0, 24 - lsrs r0, 24 - ldr r2, _08001D7C - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - movs r0, 0 - strb r0, [r1] - strb r0, [r1, 0x1] - strb r0, [r1, 0x2] - strb r0, [r1, 0x3] - movs r2, 0x80 - lsls r2, 1 - strh r2, [r1, 0x4] - strh r2, [r1, 0x6] - strh r0, [r1, 0x8] - bx lr - .align 2, 0 -_08001D7C: .4byte 0x03000180 - thumb_func_end rotscale_reset_full_2 - - thumb_func_start rotscale_frame_apply_absolute -rotscale_frame_apply_absolute: @ 8001D80 - lsls r0, 24 - lsrs r0, 24 - ldr r3, _08001DA0 - lsls r2, r0, 1 - adds r2, r0 - lsls r2, 2 - adds r2, r3 - ldrh r0, [r1] - strh r0, [r2, 0x4] - ldrh r0, [r1, 0x2] - strh r0, [r2, 0x6] - ldrb r0, [r1, 0x4] - lsls r0, 8 - strh r0, [r2, 0x8] - bx lr - .align 2, 0 -_08001DA0: .4byte 0x03000180 - thumb_func_end rotscale_frame_apply_absolute - - thumb_func_start obj_anim_image_delay_progress -obj_anim_image_delay_progress: @ 8001DA4 - push {lr} - adds r3, r0, 0 - adds r3, 0x2C - ldrb r2, [r3] - movs r0, 0x40 - ands r0, r2 - cmp r0, 0 - bne _08001DC8 - lsls r0, r2, 26 - lsrs r0, 26 - subs r0, 0x1 - movs r1, 0x3F - ands r0, r1 - movs r1, 0x40 - negs r1, r1 - ands r1, r2 - orrs r1, r0 - strb r1, [r3] -_08001DC8: - pop {r0} - bx r0 - thumb_func_end obj_anim_image_delay_progress - - thumb_func_start obj_anim_rotscale_delay_progress -obj_anim_rotscale_delay_progress: @ 8001DCC - push {lr} - lsls r1, 24 - lsrs r2, r1, 24 - adds r3, r0, 0 - adds r3, 0x2C - ldrb r1, [r3] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08001DF0 - ldr r0, _08001DF8 - lsls r1, r2, 1 - adds r1, r2 - lsls r1, 2 - adds r1, r0 - ldrb r0, [r1, 0x2] - subs r0, 0x1 - strb r0, [r1, 0x2] -_08001DF0: - ldrb r0, [r3] - lsrs r0, 7 - pop {r1} - bx r1 - .align 2, 0 -_08001DF8: .4byte 0x03000180 - thumb_func_end obj_anim_rotscale_delay_progress - - thumb_func_start rotscale_frame_apply_relative_and_sync -rotscale_frame_apply_relative_and_sync: @ 8001DFC - push {r4-r6,lr} - sub sp, 0x10 - adds r5, r0, 0 - lsls r5, 24 - lsrs r5, 24 - ldr r0, _08001E84 - lsls r4, r5, 1 - adds r4, r5 - lsls r4, 2 - adds r4, r0 - ldrh r0, [r1] - ldrh r2, [r4, 0x4] - adds r0, r2 - strh r0, [r4, 0x4] - ldrh r0, [r1, 0x2] - ldrh r2, [r4, 0x6] - adds r0, r2 - strh r0, [r4, 0x6] - ldrb r0, [r1, 0x4] - lsls r0, 8 - ldrh r1, [r4, 0x8] - adds r0, r1 - ldr r2, _08001E88 - adds r1, r2, 0 - ands r0, r1 - strh r0, [r4, 0x8] - movs r1, 0x4 - ldrsh r0, [r4, r1] - bl divide_0x10000_by - lsls r0, 16 - lsrs r0, 16 - ldr r6, _08001E8C - ldr r1, [sp] - ands r1, r6 - orrs r1, r0 - str r1, [sp] - movs r2, 0x6 - ldrsh r0, [r4, r2] - bl divide_0x10000_by - lsls r0, 16 - ldr r2, _08001E90 - ldr r1, [sp] - ands r1, r2 - orrs r1, r0 - str r1, [sp] - ldrh r1, [r4, 0x8] - ldr r0, [sp, 0x4] - ands r0, r6 - orrs r0, r1 - str r0, [sp, 0x4] - add r4, sp, 0x8 - mov r0, sp - adds r1, r4, 0 - movs r2, 0x1 - movs r3, 0x2 - bl ObjAffineSet - adds r0, r5, 0 - adds r1, r4, 0 - bl rotscale_set_indirect - add sp, 0x10 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08001E84: .4byte 0x03000180 -_08001E88: .4byte 0xffffff00 -_08001E8C: .4byte 0xffff0000 -_08001E90: .4byte 0x0000ffff - thumb_func_end rotscale_frame_apply_relative_and_sync - - thumb_func_start divide_0x10000_by -divide_0x10000_by: @ 8001E94 - push {lr} - adds r1, r0, 0 - movs r0, 0x80 - lsls r0, 9 - lsls r1, 16 - asrs r1, 16 - bl __divsi3 - lsls r0, 16 - asrs r0, 16 - pop {r1} - bx r1 - thumb_func_end divide_0x10000_by - - thumb_func_start rotscale_load_frame -rotscale_load_frame: @ 8001EAC - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r3, _08001F14 - lsls r4, r0, 1 - adds r4, r0 - lsls r4, 2 - adds r4, r3 - ldrb r3, [r4] - ldr r0, [r1, 0x10] - lsls r3, 2 - adds r3, r0 - ldrb r0, [r4, 0x1] - ldr r3, [r3] - lsls r0, 3 - adds r0, r3 - ldrh r0, [r0] - strh r0, [r2] - ldrb r3, [r4] - ldr r0, [r1, 0x10] - lsls r3, 2 - adds r3, r0 - ldrb r0, [r4, 0x1] - ldr r3, [r3] - lsls r0, 3 - adds r0, r3 - ldrh r0, [r0, 0x2] - strh r0, [r2, 0x2] - ldrb r3, [r4] - ldr r0, [r1, 0x10] - lsls r3, 2 - adds r3, r0 - ldrb r0, [r4, 0x1] - ldr r3, [r3] - lsls r0, 3 - adds r0, r3 - ldrb r0, [r0, 0x4] - strb r0, [r2, 0x4] - ldrb r3, [r4] - ldr r0, [r1, 0x10] - lsls r3, 2 - adds r3, r0 - ldrb r0, [r4, 0x1] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - ldrb r0, [r0, 0x5] - strb r0, [r2, 0x5] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08001F14: .4byte 0x03000180 - thumb_func_end rotscale_load_frame - - thumb_func_start sub_8001F18 -sub_8001F18: @ 8001F18 - push {r4,lr} - sub sp, 0x8 - adds r2, r1, 0 - lsls r0, 24 - lsrs r4, r0, 24 - movs r0, 0 - movs r1, 0 - str r0, [sp] - str r1, [sp, 0x4] - ldrb r0, [r2, 0x5] - cmp r0, 0 - beq _08001F3E - subs r0, 0x1 - strb r0, [r2, 0x5] - adds r0, r4, 0 - adds r1, r2, 0 - bl rotscale_frame_apply_relative_and_sync - b _08001F4E -_08001F3E: - adds r0, r4, 0 - adds r1, r2, 0 - bl rotscale_frame_apply_absolute - adds r0, r4, 0 - mov r1, sp - bl rotscale_frame_apply_relative_and_sync -_08001F4E: - add sp, 0x8 - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8001F18 - - thumb_func_start StartObjectImageAnim -StartObjectImageAnim: @ 8001F58 - adds r2, r0, 0 - adds r2, 0x2A - strb r1, [r2] - adds r0, 0x3F - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - movs r2, 0x11 - negs r2, r2 - ands r1, r2 - strb r1, [r0] - bx lr - thumb_func_end StartObjectImageAnim - - thumb_func_start StartObjectImageAnimIfDifferent -StartObjectImageAnimIfDifferent: @ 8001F70 - push {lr} - adds r2, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, 0x2A - ldrb r0, [r0] - cmp r0, r1 - beq _08001F86 - adds r0, r2, 0 - bl StartObjectImageAnim -_08001F86: - pop {r0} - bx r0 - thumb_func_end StartObjectImageAnimIfDifferent - - thumb_func_start SeekObjectImageAnim -SeekObjectImageAnim: @ 8001F8C - push {r4-r7,lr} - adds r3, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r4, r3, 0 - adds r4, 0x2C - ldrb r0, [r4] - lsls r0, 25 - lsrs r6, r0, 31 - subs r1, 0x1 - adds r0, r3, 0 - adds r0, 0x2B - strb r1, [r0] - ldrb r1, [r4] - movs r7, 0x40 - negs r7, r7 - adds r0, r7, 0 - ands r0, r1 - strb r0, [r4] - adds r2, r3, 0 - adds r2, 0x3F - ldrb r1, [r2] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - movs r1, 0x11 - negs r1, r1 - ands r0, r1 - strb r0, [r2] - ldrb r1, [r4] - movs r5, 0x41 - negs r5, r5 - adds r0, r5, 0 - ands r0, r1 - strb r0, [r4] - adds r0, r3, 0 - bl ContinueObjectImageAnim - ldrb r2, [r4] - movs r0, 0x3F - ands r0, r2 - cmp r0, 0 - beq _08001FF4 - lsls r0, r2, 26 - lsrs r0, 26 - adds r0, 0x1 - movs r1, 0x3F - ands r0, r1 - adds r1, r7, 0 - ands r1, r2 - orrs r1, r0 - strb r1, [r4] -_08001FF4: - lsls r2, r6, 6 - ldrb r1, [r4] - adds r0, r5, 0 - ands r0, r1 - orrs r0, r2 - strb r0, [r4] - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end SeekObjectImageAnim - - thumb_func_start StartObjectRotScalAnim -StartObjectRotScalAnim: @ 8002008 - push {r4,r5,lr} - adds r5, r0, 0 - lsls r4, r1, 24 - lsrs r4, 24 - bl obj_get_rotscale_entry_index - lsls r0, 24 - lsrs r0, 24 - adds r1, r4, 0 - bl rotscale_reset_full_1 - adds r5, 0x3F - ldrb r0, [r5] - movs r1, 0x8 - orrs r0, r1 - movs r1, 0x21 - negs r1, r1 - ands r0, r1 - strb r0, [r5] - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end StartObjectRotScalAnim - - thumb_func_start StartObjectRotScalAnimIfDifferent -StartObjectRotScalAnimIfDifferent: @ 8002034 - push {r4,r5,lr} - adds r5, r0, 0 - lsls r1, 24 - lsrs r4, r1, 24 - bl obj_get_rotscale_entry_index - lsls r0, 24 - lsrs r0, 24 - ldr r2, _08002064 - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - ldrb r0, [r1] - cmp r0, r4 - beq _0800205C - adds r0, r5, 0 - adds r1, r4, 0 - bl StartObjectRotScalAnim -_0800205C: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08002064: .4byte 0x03000180 - thumb_func_end StartObjectRotScalAnimIfDifferent - - thumb_func_start sub_8002068 -sub_8002068: @ 8002068 - push {r4,r5,lr} - adds r5, r0, 0 - lsls r4, r1, 24 - lsrs r4, 24 - bl obj_get_rotscale_entry_index - lsls r0, 24 - lsrs r0, 24 - ldr r2, _0800209C - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - strb r4, [r1] - adds r5, 0x3F - ldrb r0, [r5] - movs r1, 0x8 - orrs r0, r1 - movs r1, 0x21 - negs r1, r1 - ands r0, r1 - strb r0, [r5] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0800209C: .4byte 0x03000180 - thumb_func_end sub_8002068 - - thumb_func_start sub_80020A0 -sub_80020A0: @ 80020A0 - push {r4,r5,lr} - adds r5, r0, 0 - lsls r1, 24 - lsrs r4, r1, 24 - bl obj_get_rotscale_entry_index - lsls r0, 24 - lsrs r0, 24 - ldr r2, _080020D0 - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - ldrb r0, [r1] - cmp r0, r4 - beq _080020C8 - adds r0, r5, 0 - adds r1, r4, 0 - bl sub_8002068 -_080020C8: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080020D0: .4byte 0x03000180 - thumb_func_end sub_80020A0 - - thumb_func_start sub_80020D4 -sub_80020D4: @ 80020D4 - push {lr} - adds r3, r0, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - beq _08002120 - adds r0, r3, 0 - adds r0, 0x2A - ldrb r1, [r0] - ldr r0, [r3, 0x8] - lsls r1, 2 - adds r1, r0 - adds r0, r3, 0 - adds r0, 0x2B - ldrb r0, [r0] - ldr r1, [r1] - lsls r0, 2 - adds r0, r1 - ldrh r2, [r0] - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0 - bge _08002108 - movs r2, 0 -_08002108: - adds r0, r3, 0 - adds r0, 0x40 - ldrh r1, [r0] - adds r1, r2 - ldr r2, _08002124 - adds r0, r2, 0 - ands r1, r0 - ldrh r2, [r3, 0x4] - ldr r0, _08002128 - ands r0, r2 - orrs r0, r1 - strh r0, [r3, 0x4] -_08002120: - pop {r0} - bx r0 - .align 2, 0 -_08002124: .4byte 0x000003ff -_08002128: .4byte 0xfffffc00 - thumb_func_end sub_80020D4 - - thumb_func_start rotscale_reset_all -rotscale_reset_all: @ 800212C - push {r4,lr} - ldr r1, _08002158 - movs r0, 0 - strb r0, [r1] - ldr r1, _0800215C - movs r0, 0 - str r0, [r1] - bl ResetSpriteTransformationMatrices - movs r4, 0 -_08002140: - adds r0, r4, 0 - bl rotscale_reset_full_2 - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x1F - bls _08002140 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08002158: .4byte 0x020211c8 -_0800215C: .4byte 0x030028f4 - thumb_func_end rotscale_reset_all - - thumb_func_start rotscale_alloc_entry -rotscale_alloc_entry: @ 8002160 - push {r4,lr} - movs r2, 0 - movs r1, 0x1 - ldr r0, _08002180 - ldr r4, [r0] - adds r3, r0, 0 -_0800216C: - adds r0, r4, 0 - ands r0, r1 - cmp r0, 0 - bne _08002184 - ldr r0, [r3] - orrs r0, r1 - str r0, [r3] - adds r0, r2, 0 - b _08002192 - .align 2, 0 -_08002180: .4byte 0x030028f4 -_08002184: - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - lsls r1, 1 - cmp r2, 0x1F - bls _0800216C - movs r0, 0xFF -_08002192: - pop {r4} - pop {r1} - bx r1 - thumb_func_end rotscale_alloc_entry - - thumb_func_start rotscale_free_entry -rotscale_free_entry: @ 8002198 - push {lr} - sub sp, 0x4 - lsls r0, 24 - lsrs r2, r0, 24 - movs r0, 0 - movs r1, 0x1 - ldr r3, _080021D4 - cmp r0, r2 - bcs _080021B6 -_080021AA: - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - lsls r1, 1 - cmp r0, r2 - bcc _080021AA -_080021B6: - ldr r0, [r3] - bics r0, r1 - str r0, [r3] - movs r1, 0x80 - lsls r1, 1 - str r1, [sp] - adds r0, r2, 0 - movs r2, 0 - movs r3, 0 - bl SetSpriteTransformationMatrix - add sp, 0x4 - pop {r0} - bx r0 - .align 2, 0 -_080021D4: .4byte 0x030028f4 - thumb_func_end rotscale_free_entry - - thumb_func_start obj_alloc_rotscale_entry -obj_alloc_rotscale_entry: @ 80021D8 - push {r4,r5,lr} - adds r4, r0, 0 - bl rotscale_alloc_entry - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0xFF - beq _08002220 - ldrb r3, [r4, 0x1] - lsrs r1, r3, 6 - ldrb r2, [r4, 0x3] - lsrs r2, 6 - lsls r3, 30 - lsrs r3, 30 - adds r0, r4, 0 - bl CalcVecFromObjectCenterToObjectUpperLeft - movs r0, 0x1F - adds r1, r5, 0 - ands r1, r0 - lsls r1, 1 - ldrb r2, [r4, 0x3] - movs r0, 0x3F - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r4, 0x3] - adds r2, r4, 0 - adds r2, 0x3F - ldrb r0, [r2] - movs r1, 0x8 - orrs r0, r1 - strb r0, [r2] - adds r0, r5, 0 - bl rotscale_reset_full_2 -_08002220: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end obj_alloc_rotscale_entry - - thumb_func_start sub_8002228 -sub_8002228: @ 8002228 - push {r4-r6,lr} - mov r6, r8 - push {r6} - sub sp, 0x10 - adds r6, r0, 0 - adds r0, r1, 0 - adds r4, r2, 0 - adds r5, r3, 0 - lsls r6, 24 - lsrs r6, 24 - lsls r4, 16 - lsrs r4, 16 - lsls r5, 16 - lsrs r5, 16 - lsls r0, 16 - asrs r0, 16 - bl divide_0x10000_by - lsls r0, 16 - lsrs r0, 16 - ldr r1, _080022A0 - mov r8, r1 - ldr r1, [sp] - mov r2, r8 - ands r1, r2 - orrs r1, r0 - str r1, [sp] - lsls r4, 16 - asrs r4, 16 - adds r0, r4, 0 - bl divide_0x10000_by - lsls r0, 16 - ldr r2, _080022A4 - ldr r1, [sp] - ands r1, r2 - orrs r1, r0 - str r1, [sp] - ldr r0, [sp, 0x4] - mov r1, r8 - ands r0, r1 - orrs r0, r5 - str r0, [sp, 0x4] - add r4, sp, 0x8 - mov r0, sp - adds r1, r4, 0 - movs r2, 0x1 - movs r3, 0x2 - bl ObjAffineSet - adds r0, r6, 0 - adds r1, r4, 0 - bl rotscale_set_indirect - add sp, 0x10 - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080022A0: .4byte 0xffff0000 -_080022A4: .4byte 0x0000ffff - thumb_func_end sub_8002228 - - thumb_func_start LoadObjectPic -LoadObjectPic: @ 80022A8 - push {r4-r6,lr} - adds r5, r0, 0 - ldrh r0, [r5, 0x4] - lsrs r0, 5 - bl AllocObjectTiles - lsls r4, r0, 16 - asrs r6, r4, 16 - cmp r6, 0 - blt _080022E4 - ldrh r0, [r5, 0x6] - lsrs r4, 16 - ldrh r2, [r5, 0x4] - lsrs r2, 5 - adds r1, r4, 0 - bl AddObjectTileRange - ldr r0, [r5] - lsls r1, r6, 5 - ldr r2, _080022E0 - adds r1, r2 - ldrh r2, [r5, 0x4] - lsrs r2, 1 - bl CpuSet - adds r0, r4, 0 - b _080022E6 - .align 2, 0 -_080022E0: .4byte 0x06010000 -_080022E4: - movs r0, 0 -_080022E6: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end LoadObjectPic - - thumb_func_start LoadObjectPics -LoadObjectPics: @ 80022EC - push {r4,r5,lr} - adds r5, r0, 0 - movs r4, 0 - ldr r0, [r5] - cmp r0, 0 - beq _08002310 -_080022F8: - lsls r0, r4, 3 - adds r0, r5, r0 - bl LoadObjectPic - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - lsls r0, r4, 3 - adds r0, r5 - ldr r0, [r0] - cmp r0, 0 - bne _080022F8 -_08002310: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end LoadObjectPics - - thumb_func_start sub_8002318 -sub_8002318: @ 8002318 - push {r4,r5,lr} - adds r5, r0, 0 - ldrh r0, [r5, 0x4] - lsrs r0, 5 - bl AllocObjectTiles - lsls r4, r0, 16 - cmp r4, 0 - blt _0800233C - ldrh r0, [r5, 0x6] - lsrs r4, 16 - ldrh r2, [r5, 0x4] - lsrs r2, 5 - adds r1, r4, 0 - bl AddObjectTileRange - adds r0, r4, 0 - b _0800233E -_0800233C: - movs r0, 0 -_0800233E: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8002318 - - thumb_func_start sub_8002344 -sub_8002344: @ 8002344 - push {r4,r5,lr} - adds r5, r0, 0 - movs r4, 0 - ldr r0, [r5] - cmp r0, 0 - beq _08002368 -_08002350: - lsls r0, r4, 3 - adds r0, r5, r0 - bl sub_8002318 - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - lsls r0, r4, 3 - adds r0, r5 - ldr r0, [r0] - cmp r0, 0 - bne _08002350 -_08002368: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_8002344 - - thumb_func_start sub_8002370 -sub_8002370: @ 8002370 - push {r4,r5,lr} - adds r4, r0, 0 - ldr r5, [r4] - ldrh r0, [r4, 0x6] - bl GetObjectTileRangeStartByTag - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 11 - ldr r0, _08002398 - adds r1, r0 - ldrh r2, [r4, 0x4] - lsrs r2, 1 - adds r0, r5, 0 - bl CpuSet - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08002398: .4byte 0x06010000 - thumb_func_end sub_8002370 - - thumb_func_start sub_800239C -sub_800239C: @ 800239C - push {r4,r5,lr} - adds r5, r0, 0 - movs r4, 0 - ldr r0, [r5] - cmp r0, 0 - beq _080023C0 -_080023A8: - lsls r0, r4, 3 - adds r0, r5, r0 - bl sub_8002370 - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - lsls r0, r4, 3 - adds r0, r5 - ldr r0, [r0] - cmp r0, 0 - bne _080023A8 -_080023C0: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_800239C - - thumb_func_start FreeObjectTilesByTag -FreeObjectTilesByTag: @ 80023C8 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 16 - lsrs r0, 16 - bl IndexOfObjectTilesTag - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0xFF - beq _08002426 - ldr r0, _08002430 - lsls r1, r4, 2 - adds r2, r1, r0 - adds r0, 0x2 - adds r1, r0 - ldrh r0, [r1] - ldrh r3, [r2] - adds r0, r3, r0 - ldr r1, _08002434 - mov r8, r1 - lsls r5, r4, 1 - cmp r3, r0 - bge _0800241E - ldr r1, _08002438 - mov r12, r1 - movs r6, 0x7 - movs r7, 0x1 - adds r4, r0, 0 -_08002402: - lsrs r2, r3, 3 - add r2, r12 - adds r0, r3, 0 - ands r0, r6 - adds r1, r7, 0 - lsls r1, r0 - ldrb r0, [r2] - bics r0, r1 - strb r0, [r2] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, r4 - blt _08002402 -_0800241E: - mov r0, r8 - adds r1, r5, r0 - ldr r0, _0800243C - strh r0, [r1] -_08002426: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08002430: .4byte 0x03000080 -_08002434: .4byte 0x03000000 -_08002438: .4byte 0x03002450 -_0800243C: .4byte 0x0000ffff - thumb_func_end FreeObjectTilesByTag - - thumb_func_start FreeAllObjectTiles -FreeAllObjectTiles: @ 8002440 - push {r4-r7,lr} - movs r2, 0 - ldr r7, _08002474 - ldr r0, _08002478 - adds r6, r0, 0 - ldr r4, _0800247C - movs r3, 0 - adds r5, r4, 0x2 -_08002450: - lsls r1, r2, 1 - adds r1, r7 - ldrh r0, [r1] - orrs r0, r6 - strh r0, [r1] - lsls r1, r2, 2 - adds r0, r1, r4 - strh r3, [r0] - adds r1, r5 - strh r3, [r1] - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x3F - bls _08002450 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08002474: .4byte 0x03000000 -_08002478: .4byte 0x0000ffff -_0800247C: .4byte 0x03000080 - thumb_func_end FreeAllObjectTiles - - thumb_func_start GetObjectTileRangeStartByTag -GetObjectTileRangeStartByTag: @ 8002480 - push {lr} - lsls r0, 16 - lsrs r0, 16 - bl IndexOfObjectTilesTag - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0xFF - beq _080024A0 - ldr r0, _0800249C - lsls r1, 2 - adds r1, r0 - ldrh r0, [r1] - b _080024A2 - .align 2, 0 -_0800249C: .4byte 0x03000080 -_080024A0: - ldr r0, _080024A8 -_080024A2: - pop {r1} - bx r1 - .align 2, 0 -_080024A8: .4byte 0x0000ffff - thumb_func_end GetObjectTileRangeStartByTag - - thumb_func_start IndexOfObjectTilesTag -IndexOfObjectTilesTag: @ 80024AC - push {lr} - lsls r0, 16 - lsrs r2, r0, 16 - movs r1, 0 - ldr r3, _080024C4 -_080024B6: - lsls r0, r1, 1 - adds r0, r3 - ldrh r0, [r0] - cmp r0, r2 - bne _080024C8 - adds r0, r1, 0 - b _080024D4 - .align 2, 0 -_080024C4: .4byte 0x03000000 -_080024C8: - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x3F - bls _080024B6 - movs r0, 0xFF -_080024D4: - pop {r1} - bx r1 - thumb_func_end IndexOfObjectTilesTag - - thumb_func_start GetTagByObjectTileRangeStart -GetTagByObjectTileRangeStart: @ 80024D8 - push {r4-r6,lr} - lsls r0, 16 - lsrs r3, r0, 16 - movs r2, 0 - ldr r6, _08002500 - ldr r5, _08002504 - ldr r4, _08002508 -_080024E6: - lsls r0, r2, 1 - adds r1, r0, r6 - ldrh r0, [r1] - cmp r0, r5 - beq _0800250C - lsls r0, r2, 2 - adds r0, r4 - ldrh r0, [r0] - cmp r0, r3 - bne _0800250C - ldrh r0, [r1] - b _08002518 - .align 2, 0 -_08002500: .4byte 0x03000000 -_08002504: .4byte 0x0000ffff -_08002508: .4byte 0x03000080 -_0800250C: - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x3F - bls _080024E6 - ldr r0, _08002520 -_08002518: - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_08002520: .4byte 0x0000ffff - thumb_func_end GetTagByObjectTileRangeStart - - thumb_func_start AddObjectTileRange -AddObjectTileRange: @ 8002524 - push {r4-r6,lr} - adds r4, r0, 0 - adds r5, r1, 0 - adds r6, r2, 0 - lsls r4, 16 - lsrs r4, 16 - lsls r5, 16 - lsrs r5, 16 - lsls r6, 16 - lsrs r6, 16 - ldr r0, _08002560 - bl IndexOfObjectTilesTag - lsls r0, 24 - lsrs r0, 24 - ldr r2, _08002564 - lsls r1, r0, 1 - adds r1, r2 - strh r4, [r1] - ldr r1, _08002568 - lsls r0, 2 - adds r2, r0, r1 - strh r5, [r2] - adds r1, 0x2 - adds r0, r1 - strh r6, [r0] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08002560: .4byte 0x0000ffff -_08002564: .4byte 0x03000000 -_08002568: .4byte 0x03000080 - thumb_func_end AddObjectTileRange - - thumb_func_start sub_800256C -sub_800256C: @ 800256C - push {r4,r5,lr} - adds r4, r0, 0 - ldr r5, [r4] - ldrh r0, [r4, 0x6] - bl GetObjectTileRangeStartByTag - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 11 - ldr r0, _08002590 - adds r1, r0 - ldrh r2, [r4, 0x4] - adds r0, r5, 0 - bl AddTilesToObjectCopyRequests - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08002590: .4byte 0x06010000 - thumb_func_end sub_800256C - - thumb_func_start sub_8002594 -sub_8002594: @ 8002594 - push {r4,r5,lr} - adds r5, r0, 0 - ldrh r0, [r5, 0x4] - lsrs r0, 5 - bl AllocObjectTiles - lsls r4, r0, 16 - cmp r4, 0 - blt _080025BE - ldrh r0, [r5, 0x6] - lsrs r4, 16 - ldrh r2, [r5, 0x4] - lsrs r2, 5 - adds r1, r4, 0 - bl AddObjectTileRange - adds r0, r5, 0 - bl sub_800256C - adds r0, r4, 0 - b _080025C0 -_080025BE: - movs r0, 0 -_080025C0: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8002594 - - thumb_func_start ResetObjectPaletteAllocator -ResetObjectPaletteAllocator: @ 80025C8 - push {r4,lr} - ldr r1, _080025F4 - movs r0, 0 - strb r0, [r1] - movs r2, 0 - ldr r4, _080025F8 - ldr r0, _080025FC - adds r3, r0, 0 -_080025D8: - lsls r0, r2, 1 - adds r0, r4 - ldrh r1, [r0] - orrs r1, r3 - strh r1, [r0] - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0xF - bls _080025D8 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080025F4: .4byte 0x030028f8 -_080025F8: .4byte 0x03000300 -_080025FC: .4byte 0x0000ffff - thumb_func_end ResetObjectPaletteAllocator - - thumb_func_start LoadTaggedObjectPalette -LoadTaggedObjectPalette: @ 8002600 - push {r4,r5,lr} - adds r5, r0, 0 - ldrh r0, [r5, 0x4] - bl IndexOfObjectPaletteTag - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0xFF - beq _08002616 - adds r0, r4, 0 - b _08002646 -_08002616: - ldr r0, _0800263C - bl IndexOfObjectPaletteTag - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0xFF - beq _08002644 - ldr r1, _08002640 - lsls r0, r4, 1 - adds r0, r1 - ldrh r1, [r5, 0x4] - strh r1, [r0] - ldr r0, [r5] - lsls r1, r4, 4 - bl LoadObjectPalette - adds r0, r4, 0 - b _08002646 - .align 2, 0 -_0800263C: .4byte 0x0000ffff -_08002640: .4byte 0x03000300 -_08002644: - movs r0, 0xFF -_08002646: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end LoadTaggedObjectPalette - - thumb_func_start LoadTaggedObjectPalettes -LoadTaggedObjectPalettes: @ 800264C - push {r4,r5,lr} - adds r5, r0, 0 - movs r4, 0 - b _0800265A -_08002654: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 -_0800265A: - lsls r0, r4, 3 - adds r1, r0, r5 - ldr r0, [r1] - cmp r0, 0 - beq _08002672 - adds r0, r1, 0 - bl LoadTaggedObjectPalette - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xFF - bne _08002654 -_08002672: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end LoadTaggedObjectPalettes - - thumb_func_start LoadObjectPalette -LoadObjectPalette: @ 8002678 - push {lr} - lsls r1, 16 - movs r2, 0x80 - lsls r2, 17 - adds r1, r2 - lsrs r1, 16 - movs r2, 0x20 - bl gpu_pal_apply - pop {r0} - bx r0 - thumb_func_end LoadObjectPalette - - thumb_func_start AllocObjectPalette -AllocObjectPalette: @ 8002690 - push {r4,lr} - lsls r0, 16 - lsrs r4, r0, 16 - ldr r0, _080026B0 - bl IndexOfObjectPaletteTag - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0xFF - beq _080026B8 - ldr r1, _080026B4 - lsls r0, r2, 1 - adds r0, r1 - strh r4, [r0] - adds r0, r2, 0 - b _080026BA - .align 2, 0 -_080026B0: .4byte 0x0000ffff -_080026B4: .4byte 0x03000300 -_080026B8: - movs r0, 0xFF -_080026BA: - pop {r4} - pop {r1} - bx r1 - thumb_func_end AllocObjectPalette - - thumb_func_start IndexOfObjectPaletteTag -IndexOfObjectPaletteTag: @ 80026C0 - push {lr} - lsls r0, 16 - lsrs r2, r0, 16 - ldr r0, _080026E0 - ldrb r1, [r0] - cmp r1, 0xF - bhi _080026F2 - ldr r3, _080026E4 -_080026D0: - lsls r0, r1, 1 - adds r0, r3 - ldrh r0, [r0] - cmp r0, r2 - bne _080026E8 - adds r0, r1, 0 - b _080026F4 - .align 2, 0 -_080026E0: .4byte 0x030028f8 -_080026E4: .4byte 0x03000300 -_080026E8: - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0xF - bls _080026D0 -_080026F2: - movs r0, 0xFF -_080026F4: - pop {r1} - bx r1 - thumb_func_end IndexOfObjectPaletteTag - - thumb_func_start gpu_pal_tag_by_index -gpu_pal_tag_by_index: @ 80026F8 - lsls r0, 24 - ldr r1, _08002704 - lsrs r0, 23 - adds r0, r1 - ldrh r0, [r0] - bx lr - .align 2, 0 -_08002704: .4byte 0x03000300 - thumb_func_end gpu_pal_tag_by_index - - thumb_func_start FreeObjectPaletteByTag -FreeObjectPaletteByTag: @ 8002708 - push {lr} - lsls r0, 16 - lsrs r0, 16 - bl IndexOfObjectPaletteTag - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0xFF - beq _08002724 - ldr r0, _08002728 - lsls r1, 1 - adds r1, r0 - ldr r0, _0800272C - strh r0, [r1] -_08002724: - pop {r0} - bx r0 - .align 2, 0 -_08002728: .4byte 0x03000300 -_0800272C: .4byte 0x0000ffff - thumb_func_end FreeObjectPaletteByTag - - thumb_func_start SetSpriteOamTables_NoPriorityFromTable -SetSpriteOamTables_NoPriorityFromTable: @ 8002730 - str r1, [r0, 0x18] - adds r0, 0x42 - movs r1, 0x40 - strb r1, [r0] - bx lr - thumb_func_end SetSpriteOamTables_NoPriorityFromTable - - thumb_func_start AddSprite -AddSprite: @ 800273C - push {r4,lr} - adds r4, r0, 0 - adds r3, r1, 0 - ldr r1, _08002750 - ldrb r0, [r3] - ldrb r1, [r1] - cmp r0, r1 - bcc _08002754 - movs r0, 0x1 - b _0800279C - .align 2, 0 -_08002750: .4byte 0x030024d4 -_08002754: - ldr r0, [r4, 0x18] - cmp r0, 0 - beq _08002768 - adds r0, r4, 0 - adds r0, 0x42 - ldrb r1, [r0] - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0 - bne _08002788 -_08002768: - ldr r0, _08002784 - ldrb r2, [r3] - lsls r2, 3 - adds r2, r0 - ldr r0, [r4] - ldr r1, [r4, 0x4] - str r0, [r2, 0x3C] - str r1, [r2, 0x40] - ldrb r0, [r3] - adds r0, 0x1 - strb r0, [r3] - movs r0, 0 - b _0800279C - .align 2, 0 -_08002784: .4byte 0x03001770 -_08002788: - ldrb r1, [r3] - lsls r1, 3 - ldr r0, _080027A4 - adds r1, r0 - adds r0, r4, 0 - adds r2, r3, 0 - bl AddSpritesFromSpriteOamTable - lsls r0, 24 - lsrs r0, 24 -_0800279C: - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_080027A4: .4byte 0x030017ac - thumb_func_end AddSprite - - thumb_func_start AddSpritesFromSpriteOamTable -AddSpritesFromSpriteOamTable: @ 80027A8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x1C - adds r3, r0, 0 - str r1, [sp] - mov r8, r2 - ldr r0, _080027C8 - ldrb r1, [r2] - ldrb r0, [r0] - cmp r1, r0 - bcc _080027CC -_080027C4: - movs r0, 0x1 - b _08002984 - .align 2, 0 -_080027C8: .4byte 0x030024d4 -_080027CC: - adds r0, r3, 0 - adds r0, 0x42 - ldrb r1, [r0] - lsls r1, 26 - lsrs r1, 23 - ldr r2, [r3, 0x18] - adds r7, r2, r1 - mov r12, r3 - str r0, [sp, 0x18] - cmp r7, 0 - beq _080027E8 - ldr r0, [r7, 0x4] - cmp r0, 0 - bne _080027FE -_080027E8: - mov r2, r12 - ldr r0, [r2] - ldr r1, [r2, 0x4] - ldr r2, [sp] - str r0, [r2] - str r1, [r2, 0x4] - mov r1, r8 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - b _08002982 -_080027FE: - mov r2, r12 - ldrh r0, [r2, 0x4] - lsls r0, 22 - lsrs r0, 22 - str r0, [sp, 0x4] - ldrb r0, [r7] - str r0, [sp, 0xC] - ldrb r0, [r2, 0x3] - lsls r0, 26 - lsrs r0, 27 - asrs r1, r0, 3 - str r1, [sp, 0x10] - movs r1, 0x1 - ldr r2, [sp, 0x10] - ands r2, r1 - str r2, [sp, 0x10] - asrs r0, 4 - mov r10, r0 - ands r0, r1 - mov r10, r0 - mov r1, r12 - ldrh r0, [r1, 0x2] - lsls r0, 23 - lsrs r0, 23 - adds r1, 0x28 - ldrb r1, [r1] - lsls r1, 24 - asrs r1, 24 - subs r0, r1 - lsls r0, 16 - lsrs r2, r0, 16 - mov r1, r12 - ldrb r0, [r1] - adds r1, 0x29 - ldrb r1, [r1] - lsls r1, 24 - asrs r1, 24 - subs r0, r1 - lsls r0, 16 - lsrs r0, 16 - str r0, [sp, 0x8] - movs r0, 0 - mov r9, r0 - ldr r1, [sp, 0xC] - cmp r9, r1 - bcc _0800285C - b _08002982 -_0800285C: - lsls r0, r2, 16 - asrs r0, 16 - str r0, [sp, 0x14] -_08002862: - mov r2, r8 - ldrb r0, [r2] - ldr r1, _08002994 - ldrb r1, [r1] - cmp r0, r1 - bcs _080027C4 - ldr r0, [r7, 0x4] - mov r2, r9 - lsls r6, r2, 3 - adds r2, r6, r0 - ldrh r4, [r2] - ldrh r5, [r2, 0x2] - ldr r0, [sp, 0x10] - cmp r0, 0 - beq _080028A6 - ldrb r1, [r2, 0x4] - movs r0, 0xC - ands r0, r1 - lsls r1, 30 - lsrs r1, 26 - adds r0, r1 - ldr r1, _08002998 - adds r0, r1 - movs r1, 0 - ldrsb r1, [r0, r1] - lsls r0, r4, 16 - asrs r0, 16 - adds r0, r1 - lsls r0, 16 - lsrs r4, r0, 16 - mvns r0, r4 - adds r0, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 -_080028A6: - mov r0, r10 - cmp r0, 0 - beq _080028D2 - ldrb r1, [r2, 0x4] - movs r0, 0xC - ands r0, r1 - lsls r1, 30 - lsrs r1, 26 - adds r0, r1 - ldr r1, _08002998 - adds r0, r1 - movs r1, 0x1 - ldrsb r1, [r0, r1] - lsls r0, r5, 16 - asrs r0, 16 - adds r0, r1 - lsls r0, 16 - lsrs r5, r0, 16 - mvns r0, r5 - adds r0, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 -_080028D2: - ldr r2, [sp] - adds r3, r6, r2 - mov r2, r12 - ldr r0, [r2] - ldr r1, [r2, 0x4] - str r0, [r3] - str r1, [r3, 0x4] - ldr r0, [r7, 0x4] - adds r0, r6, r0 - ldrb r1, [r0, 0x4] - lsls r1, 30 - lsrs r1, 24 - ldrb r2, [r3, 0x1] - movs r0, 0x3F - ands r0, r2 - orrs r0, r1 - strb r0, [r3, 0x1] - ldr r0, [r7, 0x4] - adds r0, r6, r0 - ldrb r1, [r0, 0x4] - lsls r1, 28 - lsrs r1, 30 - lsls r1, 6 - ldrb r2, [r3, 0x3] - movs r0, 0x3F - ands r0, r2 - orrs r0, r1 - strb r0, [r3, 0x3] - lsls r1, r4, 16 - asrs r1, 16 - ldr r0, [sp, 0x14] - adds r1, r0, r1 - ldr r2, _0800299C - adds r0, r2, 0 - ands r1, r0 - ldrh r2, [r3, 0x2] - ldr r0, _080029A0 - ands r0, r2 - orrs r0, r1 - strh r0, [r3, 0x2] - ldr r1, [sp, 0x8] - adds r0, r1, r5 - strb r0, [r3] - ldr r0, [r7, 0x4] - adds r0, r6, r0 - ldrh r1, [r0, 0x4] - lsls r1, 18 - lsrs r1, 22 - ldr r2, [sp, 0x4] - adds r1, r2, r1 - ldr r2, _080029A4 - adds r0, r2, 0 - ands r1, r0 - ldrh r2, [r3, 0x4] - ldr r0, _080029A8 - ands r0, r2 - orrs r0, r1 - strh r0, [r3, 0x4] - ldr r0, [sp, 0x18] - ldrb r1, [r0] - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0x80 - beq _08002968 - ldr r0, [r7, 0x4] - adds r0, r6, r0 - ldrb r1, [r0, 0x5] - lsrs r1, 6 - lsls r1, 2 - ldrb r2, [r3, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3, 0x5] -_08002968: - mov r0, r9 - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - mov r1, r8 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - ldr r2, [sp, 0xC] - cmp r9, r2 - bcs _08002982 - b _08002862 -_08002982: - movs r0, 0 -_08002984: - add sp, 0x1C - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_08002994: .4byte 0x030024d4 -_08002998: .4byte gUnknown_081E2970 -_0800299C: .4byte 0x000001ff -_080029A0: .4byte 0xfffffe00 -_080029A4: .4byte 0x000003ff -_080029A8: .4byte 0xfffffc00 - thumb_func_end AddSpritesFromSpriteOamTable - thumb_func_start SyncBgVisibilityAndMode SyncBgVisibilityAndMode: @ 80029AC ldrb r2, [r0] diff --git a/asm/rom2.s b/asm/rom2.s index 17df814d0..3b0d442e3 100644 --- a/asm/rom2.s +++ b/asm/rom2.s @@ -157,8 +157,8 @@ _080071A0: .4byte gUnknown_081E29A8 thumb_func_start sub_80071A4 sub_80071A4: @ 80071A4 push {r4-r6,lr} - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes bl ResetTasks ldr r0, _08007248 bl SetVBlankCallback @@ -204,8 +204,8 @@ _080071E4: movs r1, 0 bl CreateTask bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably ldr r1, _08007264 movs r0, 0 @@ -310,8 +310,8 @@ _080072FC: .4byte gGameVersion thumb_func_start sub_8007300 sub_8007300: @ 8007300 push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -663,8 +663,8 @@ c2_08009A8C: @ 80075CC movs r2, 0 bl sub_8007428 bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r0} bx r0 @@ -2837,8 +2837,8 @@ _080085B8: .4byte 0x0300295c thumb_func_start sub_80085BC sub_80085BC: @ 80085BC push {r4,lr} - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes bl pal_fade_control_reset_maybe movs r0, 0 movs r1, 0 @@ -2873,8 +2873,8 @@ sub_80085BC: @ 80085BC bl CreateTask bl sub_8074D08 bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably ldr r0, _0800864C bl SetMainCallback2 diff --git a/asm/rom3.s b/asm/rom3.s index ac0c04136..f301ffb8c 100644 --- a/asm/rom3.s +++ b/asm/rom3.s @@ -8,8 +8,8 @@ sub_80096C4: @ 80096C4 push {lr} bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r0} bx r0 @@ -18,8 +18,8 @@ sub_80096C4: @ 80096C4 thumb_func_start sub_80096DC sub_80096DC: @ 80096DC push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -109,8 +109,8 @@ sub_8009708: @ 8009708 bl gpu_pal_apply bl remove_some_task bl ResetTasks - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes ldr r0, _080097D4 bl ShowBg ldr r0, _080097D8 @@ -1432,8 +1432,8 @@ task_new_game_prof_birch_speech_1: @ 800A1F4 movs r2, 0x10 bl gpu_pal_apply bl remove_some_task - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes adds r0, r4, 0 bl AddBirchSpeechObjects movs r0, 0x1 @@ -3080,10 +3080,10 @@ task_new_game_prof_birch_speech_part2_9: @ 800AED4 ldr r1, _0800AF74 str r1, [r0] adds r0, r5, 0 - bl obj_alloc_rotscale_entry + bl InitSpriteAffineAnim adds r0, r5, 0 movs r1, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim adds r0, r7, 0 adds r0, 0x1C adds r4, r0 @@ -3307,8 +3307,8 @@ new_game_prof_birch_speech_part2_start: @ 800B060 ldr r0, _0800B164 strh r0, [r4, 0x10] bl remove_some_task - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes adds r0, r5, 0 bl AddBirchSpeechObjects ldr r0, _0800B168 @@ -3486,7 +3486,7 @@ sub_800B25C: @ 800B25C adds r1, r5, 0 adds r2, r6, 0 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 add sp, 0x8 @@ -7675,7 +7675,7 @@ LoadCompressedObjectPic: @ 800D250 orrs r0, r1 str r0, [sp, 0x4] mov r0, sp - bl LoadObjectPic + bl LoadSpriteSheet add sp, 0x8 pop {r4,r5} pop {r0} @@ -7697,7 +7697,7 @@ LoadCompressedObjectPicOverrideBuffer: @ 800D27C orrs r0, r1 str r0, [sp, 0x4] mov r0, sp - bl LoadObjectPic + bl LoadSpriteSheet add sp, 0x8 pop {r4,r5} pop {r0} @@ -7722,7 +7722,7 @@ LoadCompressedObjectPalette: @ 800D2A4 orrs r0, r2 str r0, [sp, 0x4] mov r0, sp - bl LoadTaggedObjectPalette + bl LoadSpritePalette add sp, 0x8 pop {r4,r5} pop {r0} @@ -7747,7 +7747,7 @@ LoadCompressedObjectPaletteOverrideBuffer: @ 800D2D8 orrs r0, r2 str r0, [sp, 0x4] mov r0, sp - bl LoadTaggedObjectPalette + bl LoadSpritePalette add sp, 0x8 pop {r4,r5} pop {r0} @@ -8264,12 +8264,12 @@ _0800D674: thumb_func_start sub_800D684 sub_800D684: @ 800D684 push {lr} - bl ResetAllObjectData + bl ResetSpriteData ldr r0, _0800D6B8 movs r1, 0 movs r2, 0 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r2, _0800D6BC @@ -8295,8 +8295,8 @@ _0800D6C0: .4byte sub_800D6C4 thumb_func_start sub_800D6C4 sub_800D6C4: @ 800D6C4 push {lr} - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer pop {r0} bx r0 thumb_func_end sub_800D6C4 @@ -9315,7 +9315,7 @@ _0800DF94: .4byte 0x03002978 _0800DF98: .4byte 0x03004b20 _0800DF9C: ldr r0, _0800E010 - bl AllocObjectPalette + bl AllocSpritePalette lsls r0, 24 ldr r2, _0800E014 lsrs r0, 19 @@ -9331,7 +9331,7 @@ _0800DF9C: movs r1, 0x6C movs r2, 0x50 movs r3, 0 - bl AddObjectToFront + bl CreateSprite ldr r4, _0800E028 ldr r2, _0800E02C adds r7, r4, r2 @@ -9340,7 +9340,7 @@ _0800DF9C: movs r1, 0x84 movs r2, 0x50 movs r3, 0 - bl AddObjectToFront + bl CreateSprite ldr r5, _0800E034 adds r4, r5 strb r0, [r4] @@ -10416,10 +10416,10 @@ _0800E868: bl sub_8002D54 bl sub_800D6D4 bl sub_800DAB8 - bl ResetAllObjectData + bl ResetSpriteData bl ResetTasks bl sub_800E23C - bl ResetObjectPaletteAllocator + bl FreeAllSpritePalettes ldr r1, _0800E968 movs r0, 0x4 strb r0, [r1] @@ -10869,8 +10869,8 @@ _0800EC98: .4byte gUnknown_081F96C8 sub_800EC9C: @ 800EC9C push {r4-r7,lr} bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl link_get_multiplayer_id lsls r0, 24 lsrs r4, r0, 24 @@ -11397,8 +11397,8 @@ sub_800F104: @ 800F104 adds r0, r4 mov r8, r0 bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer ldr r5, _0800F158 ldrb r0, [r5] cmp r0, 0x1 @@ -11579,8 +11579,8 @@ sub_800F298: @ 800F298 adds r0, r1 strb r6, [r0] bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer ldr r0, _0800F2D8 ldrb r0, [r0] cmp r0, 0x7 @@ -12259,8 +12259,8 @@ _0800F804: .4byte 0x0202ff5e thumb_func_start sub_800F808 sub_800F808: @ 800F808 push {lr} - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer ldr r0, _0800F824 bl sub_800374C bl fade_and_return_progress_probably @@ -12964,8 +12964,8 @@ sub_800FCFC: @ 800FCFC ldr r0, _0800FDA8 ldrh r0, [r0] strh r0, [r1] - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram bl sub_8089668 pop {r0} @@ -13035,13 +13035,13 @@ _0800FDE2: beq _0800FE16 ldr r4, _0800FE1C adds r0, r4, 0 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag adds r0, r4, 0 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag adds r0, r5, 0 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix adds r0, r5, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _0800FE16: pop {r4,r5} pop {r0} @@ -13055,7 +13055,7 @@ sub_800FE20: @ 800FE20 push {r4,lr} adds r4, r0, 0 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim ldr r0, _0800FE3C str r0, [r4, 0x1C] movs r0, 0x68 @@ -13403,13 +13403,13 @@ _08010084: movs r2, 0x40 bl decompress_palette bl sub_800D74C - bl ResetAllObjectData + bl ResetSpriteData bl ResetTasks bl sub_800E23C ldr r1, _0801019C movs r0, 0x37 strh r0, [r1] - bl ResetObjectPaletteAllocator + bl FreeAllSpritePalettes ldr r1, _080101A0 movs r0, 0x4 strb r0, [r1] @@ -13477,8 +13477,8 @@ _080101B4: .4byte 0x02024d1e sub_80101B8: @ 80101B8 push {lr} bl c2_081284E0 - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably bl RunTasks pop {r0} @@ -13555,7 +13555,7 @@ oac_poke_opponent: @ 8010248 ldr r1, _08010270 str r1, [r0, 0x1C] movs r1, 0 - bl StartObjectImageAnimIfDifferent + bl StartSpriteAnimIfDifferent movs r0, 0x80 lsls r0, 10 ldr r1, _08010274 @@ -13626,7 +13626,7 @@ sub_80102AC: @ 80102AC str r0, [r4, 0x1C] adds r0, r4, 0 movs r1, 0 - bl StartObjectImageAnimIfDifferent + bl StartSpriteAnimIfDifferent movs r0, 0x80 lsls r0, 10 ldr r1, _08010304 @@ -13879,9 +13879,9 @@ sub_8010494: @ 8010494 cmp r0, 0 bge _080104C8 adds r0, r4, 0 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite b _08010510 _080104C8: ldrh r0, [r4, 0x2E] @@ -13918,7 +13918,7 @@ _080104F6: adds r1, r0 ldrb r1, [r1] adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim _08010510: pop {r4} pop {r0} @@ -14238,7 +14238,7 @@ dp11b_obj_free: @ 8010714 ldrh r1, [r0, 0x34] lsls r1, 24 lsrs r4, r1, 24 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldrb r1, [r5] movs r0, 0x3 negs r0, r0 @@ -14266,7 +14266,7 @@ _0801075C: ldrh r1, [r0, 0x34] lsls r1, 24 lsrs r4, r1, 24 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldrb r1, [r5] movs r0, 0x5 negs r0, r0 @@ -20861,7 +20861,7 @@ sub_8013DA8: @ 8013DA8 ands r0, r1 cmp r0, 0 bne _08013DEA - bl ResetAllObjectData + bl ResetSpriteData ldr r0, _08013DD4 ldrb r0, [r0] cmp r0, 0 @@ -70746,7 +70746,7 @@ _0802D228: _0802D22C: .4byte 0x02020004 _0802D230: .4byte 0x02024be0 _0802D234: .4byte 0x02024a60 -_0802D238: .4byte nullsub_2 +_0802D238: .4byte SpriteCallbackDummy thumb_func_end sub_802D204 thumb_func_start sub_802D23C @@ -70775,7 +70775,7 @@ _0802D260: _0802D264: .4byte 0x02020004 _0802D268: .4byte 0x02024be0 _0802D26C: .4byte 0x02024a60 -_0802D270: .4byte nullsub_2 +_0802D270: .4byte SpriteCallbackDummy thumb_func_end sub_802D23C thumb_func_start sub_802D274 @@ -70807,7 +70807,7 @@ sub_802D274: @ 802D274 adds r0, r1 lsls r0, 2 adds r0, r6 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -70815,7 +70815,7 @@ sub_802D274: @ 802D274 adds r0, r1 lsls r0, 2 adds r0, r6 - bl RemoveObjectAndFreeTiles + bl DestroySprite bl dp01_tbl1_exec_completed _0802D2C6: pop {r4-r6} @@ -70825,7 +70825,7 @@ _0802D2C6: _0802D2CC: .4byte 0x02020004 _0802D2D0: .4byte 0x02024be0 _0802D2D4: .4byte 0x02024a60 -_0802D2D8: .4byte nullsub_2 +_0802D2D8: .4byte SpriteCallbackDummy _0802D2DC: .4byte 0x02024ea4 thumb_func_end sub_802D274 @@ -70902,7 +70902,7 @@ _0802D360: .4byte 0x020239f8 _0802D364: .4byte 0x02020004 _0802D368: .4byte 0x03004340 _0802D36C: .4byte 0x02024a60 -_0802D370: .4byte nullsub_2 +_0802D370: .4byte SpriteCallbackDummy _0802D374: ldr r2, _0802D45C ldr r5, _0802D460 @@ -71008,9 +71008,9 @@ _0802D3D8: strb r4, [r0, 0x1] ldr r4, _0802D470 adds r0, r4, 0 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag adds r0, r4, 0 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag ldr r0, _0802D474 ldrh r1, [r0] movs r0, 0x40 @@ -71024,7 +71024,7 @@ _0802D3D8: _0802D45C: .4byte 0x02020004 _0802D460: .4byte 0x03004340 _0802D464: .4byte 0x02024a60 -_0802D468: .4byte nullsub_2 +_0802D468: .4byte SpriteCallbackDummy _0802D46C: .4byte 0x02017810 _0802D470: .4byte 0x000027f9 _0802D474: .4byte 0x020239f8 @@ -71181,7 +71181,7 @@ _0802D55E: lsls r0, 2 ldr r1, _0802D66C adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r4, _0802D670 ldrb r0, [r5] adds r1, r6, 0 @@ -71217,7 +71217,7 @@ _0802D5EE: lsls r0, 2 ldr r1, _0802D66C adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r5, _0802D670 ldrb r1, [r4] adds r0, r1, r5 @@ -71312,9 +71312,9 @@ sub_802D680: @ 802D680 strb r0, [r1, 0x1] ldr r4, _0802D724 adds r0, r4, 0 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag adds r0, r4, 0 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag ldrb r2, [r6] lsls r0, r2, 2 adds r1, r5, 0 @@ -71344,7 +71344,7 @@ _0802D708: _0802D710: .4byte 0x02020004 _0802D714: .4byte 0x03004340 _0802D718: .4byte 0x02024a60 -_0802D71C: .4byte nullsub_2 +_0802D71C: .4byte SpriteCallbackDummy _0802D720: .4byte 0x02017810 _0802D724: .4byte 0x000027f9 _0802D728: .4byte 0x03004330 @@ -71449,7 +71449,7 @@ _0802D7C6: cmp r0, 0 bne _0802D83C adds r0, r3, r4 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r4, _0802D860 ldrb r1, [r5] adds r0, r1, r4 @@ -71489,7 +71489,7 @@ _0802D84C: .4byte 0x02024a6a _0802D850: .4byte 0x03004360 _0802D854: .4byte 0x02020004 _0802D858: .4byte 0x0300434c -_0802D85C: .4byte nullsub_2 +_0802D85C: .4byte SpriteCallbackDummy _0802D860: .4byte 0x03004340 _0802D864: .4byte 0x03004330 _0802D868: .4byte sub_802D680 @@ -72233,7 +72233,7 @@ sub_802DE10: @ 802DE10 ldrb r0, [r0, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -72241,7 +72241,7 @@ sub_802DE10: @ 802DE10 adds r0, r1 lsls r0, 2 adds r0, r6 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r1, _0802DEA8 ldrb r0, [r4] adds r0, r1 @@ -72284,7 +72284,7 @@ sub_802DEAC: @ 802DEAC lsls r0, 2 ldr r4, _0802DF10 adds r0, r4 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] @@ -72292,7 +72292,7 @@ sub_802DEAC: @ 802DEAC adds r0, r1 lsls r0, 2 adds r0, r4 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r1, _0802DF14 ldrb r0, [r6] adds r0, r1 @@ -75521,7 +75521,7 @@ sub_802F934: @ 802F934 mov r0, r10 adds r1, r5, 0 adds r2, r4, 0 - bl AddObjectToFront + bl CreateSprite ldr r4, _0802FA90 adds r4, r6, r4 strb r0, [r4] @@ -75566,7 +75566,7 @@ sub_802F934: @ 802F934 ldr r1, _0802FA98 adds r6, r1 ldrb r1, [r6] - bl StartObjectImageAnim + bl StartSpriteAnim ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -75615,7 +75615,7 @@ _0802FA8C: .4byte 0x02024e8c _0802FA90: .4byte 0x02024be0 _0802FA94: .4byte 0x02020004 _0802FA98: .4byte 0x02024e84 -_0802FA9C: .4byte nullsub_2 +_0802FA9C: .4byte SpriteCallbackDummy thumb_func_end sub_802F934 thumb_func_start sub_802FAA0 @@ -75658,7 +75658,7 @@ _0802FAE4: lsls r0, 2 ldr r4, _0802FB24 adds r0, r4 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] @@ -75666,7 +75666,7 @@ _0802FAE4: adds r0, r1 lsls r0, 2 adds r0, r4 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r1, _0802FB28 ldrb r0, [r6] adds r0, r1 @@ -75822,7 +75822,7 @@ _0802FBEA: mov r0, r8 adds r1, r5, 0 adds r2, r4, 0 - bl AddObjectToFront + bl CreateSprite ldr r5, _0802FCC8 ldrb r1, [r6] adds r1, r5 @@ -75924,7 +75924,7 @@ sub_802FCE0: @ 802FCE0 asrs r2, 16 movs r1, 0x50 movs r3, 0x1E - bl AddObjectToFront + bl CreateSprite ldr r6, _0802FDA4 ldrb r1, [r5] adds r1, r6 @@ -76062,7 +76062,7 @@ sub_802FDBC: @ 802FDBC lsls r0, 2 adds r0, r4 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r1, _0802FE74 ldrb r0, [r6] lsls r0, 2 @@ -76078,7 +76078,7 @@ _0802FE60: .4byte 0x02024a60 _0802FE64: .4byte 0x02020004 _0802FE68: .4byte 0x0000ffd8 _0802FE6C: .4byte sub_8078B34 -_0802FE70: .4byte nullsub_2 +_0802FE70: .4byte SpriteCallbackDummy _0802FE74: .4byte 0x03004330 _0802FE78: .4byte sub_802D274 thumb_func_end sub_802FDBC @@ -77924,9 +77924,9 @@ sub_8030CC0: @ 8030CC0 lsls r0, 2 adds r0, r5 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r0, _08030E10 - bl AllocObjectPalette + bl AllocSpritePalette adds r4, r0, 0 lsls r4, 24 ldr r1, _08030E14 @@ -78026,15 +78026,15 @@ sub_8030E38: @ 8030E38 ldrh r4, [r5, 0x38] lsls r4, 24 lsrs r4, 24 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix ldrb r0, [r5, 0x5] lsrs r0, 4 - bl gpu_pal_tag_by_index + bl GetSpritePaletteTagByPaletteNum lsls r0, 16 lsrs r0, 16 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag adds r0, r5, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r1, _08030E90 lsls r0, r4, 1 adds r0, r1 @@ -78054,7 +78054,7 @@ sub_8030E38: @ 8030E38 ldr r1, _08030E9C adds r0, r1 movs r1, 0 - bl StartObjectImageAnim + bl StartSpriteAnim pop {r4,r5} pop {r0} bx r0 @@ -78659,7 +78659,7 @@ _08031338: str r1, [r0] adds r0, r3, 0 movs r1, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim ldr r0, _08031360 str r0, [r6, 0x1C] _08031354: @@ -78668,7 +78668,7 @@ _08031354: bx r0 .align 2, 0 _0803135C: .4byte sub_80105DC -_08031360: .4byte nullsub_2 +_08031360: .4byte SpriteCallbackDummy thumb_func_end sub_80312F0 thumb_func_start sub_8031364 @@ -78688,17 +78688,17 @@ sub_8031364: @ 8031364 bne _0803138C adds r0, r4, 0 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim b _08031394 .align 2, 0 -_08031388: .4byte nullsub_2 +_08031388: .4byte SpriteCallbackDummy _0803138C: adds r0, r4, 0 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim _08031394: adds r0, r4, 0 - bl AnimateObject + bl AnimateSprite pop {r4} pop {r0} bx r0 @@ -78728,7 +78728,7 @@ _080313C2: bx r0 .align 2, 0 _080313C8: .4byte 0x02024de8 -_080313CC: .4byte nullsub_2 +_080313CC: .4byte SpriteCallbackDummy thumb_func_end sub_80313A0 thumb_func_start move_anim_start_t2_for_situation @@ -79696,11 +79696,11 @@ sub_8031B74: @ 8031B74 lsrs r4, 13 adds r0, r4, r0 ldrh r0, [r0, 0x4] - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag ldr r0, _08031B9C adds r4, r0 ldrh r0, [r4, 0x6] - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag pop {r4} pop {r0} bx r0 @@ -79714,10 +79714,10 @@ sub_8031BA0: @ 8031BA0 push {r4-r7,lr} ldr r4, _08031BCC adds r0, r4, 0 - bl LoadTaggedObjectPalette + bl LoadSpritePalette adds r4, 0x8 adds r0, r4, 0 - bl LoadTaggedObjectPalette + bl LoadSpritePalette bl battle_type_is_double lsls r0, 24 cmp r0, 0 @@ -79789,10 +79789,10 @@ _08031C40: bne _08031C5C ldr r4, _08031C58 adds r0, r4, 0 - bl LoadTaggedObjectPalette + bl LoadSpritePalette adds r4, 0x8 adds r0, r4, 0 - bl LoadTaggedObjectPalette + bl LoadSpritePalette b _08031D52 .align 2, 0 _08031C58: .4byte gUnknown_0820A4D4 @@ -80265,7 +80265,7 @@ sub_8031FC4: @ 8031FC4 adds r0, r7 ldr r4, _0803206C ldrb r1, [r4] - bl StartObjectImageAnim + bl StartSpriteAnim mov r2, r8 lsls r0, r2, 20 movs r5, 0x80 @@ -80614,7 +80614,7 @@ _080322C8: ldr r1, _0803233C add r1, r8 ldrb r1, [r1] - bl StartObjectImageAnim + bl StartSpriteAnim _080322F6: add sp, 0x10 pop {r3-r5} @@ -80801,7 +80801,7 @@ refresh_graphics_maybe: @ 8032464 adds r0, r6, r0 ldrb r1, [r0] adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim cmp r5, 0 bne _080324A8 adds r0, r6, 0 @@ -81249,7 +81249,7 @@ sub_80327CC: @ 80327CC mov r0, r8 adds r1, r4, 0 movs r3, 0xC8 - bl AddObjectToFront + bl CreateSprite lsls r1, r5, 1 adds r1, r5 lsls r1, 2 @@ -81291,7 +81291,7 @@ sub_80327CC: @ 80327CC mov r0, r8 adds r1, r4, 0 movs r3, 0xC8 - bl AddObjectToFront + bl CreateSprite lsls r1, r5, 1 adds r1, r5 lsls r1, 2 @@ -81709,7 +81709,7 @@ _08032B70: _08032B74: .4byte 0x02020004 _08032B78: .4byte 0x02024be0 _08032B7C: .4byte 0x02024a60 -_08032B80: .4byte nullsub_2 +_08032B80: .4byte SpriteCallbackDummy thumb_func_end sub_8032B4C thumb_func_start sub_8032B84 @@ -81738,7 +81738,7 @@ _08032BA8: _08032BAC: .4byte 0x02020004 _08032BB0: .4byte 0x02024be0 _08032BB4: .4byte 0x02024a60 -_08032BB8: .4byte nullsub_2 +_08032BB8: .4byte SpriteCallbackDummy thumb_func_end sub_8032B84 thumb_func_start sub_8032BBC @@ -81785,7 +81785,7 @@ sub_8032BBC: @ 8032BBC adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix ldrb r0, [r5] adds r0, r6 ldrb r1, [r0] @@ -81793,7 +81793,7 @@ sub_8032BBC: @ 8032BBC adds r0, r1 lsls r0, 2 adds r0, r4 - bl RemoveObjectAndFreeTiles + bl DestroySprite bl sub_80334EC _08032C2C: pop {r4-r6} @@ -81803,7 +81803,7 @@ _08032C2C: _08032C34: .4byte 0x02020004 _08032C38: .4byte 0x02024be0 _08032C3C: .4byte 0x02024a60 -_08032C40: .4byte nullsub_2 +_08032C40: .4byte SpriteCallbackDummy _08032C44: .4byte 0x000003ff _08032C48: .4byte 0xfffffc00 thumb_func_end sub_8032BBC @@ -81881,7 +81881,7 @@ _08032CCC: .4byte 0x020239f8 _08032CD0: .4byte 0x02020004 _08032CD4: .4byte 0x03004340 _08032CD8: .4byte 0x02024a60 -_08032CDC: .4byte nullsub_2 +_08032CDC: .4byte SpriteCallbackDummy _08032CE0: ldr r2, _08032DC4 ldr r5, _08032DC8 @@ -81983,9 +81983,9 @@ _08032D22: strb r4, [r0, 0x1] ldr r4, _08032DD8 adds r0, r4, 0 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag adds r0, r4, 0 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag ldr r0, _08032DDC ldrh r1, [r0] movs r0, 0x40 @@ -81999,7 +81999,7 @@ _08032D22: _08032DC4: .4byte 0x02020004 _08032DC8: .4byte 0x03004340 _08032DCC: .4byte 0x02024a60 -_08032DD0: .4byte nullsub_2 +_08032DD0: .4byte SpriteCallbackDummy _08032DD4: .4byte 0x02017810 _08032DD8: .4byte 0x000027f9 _08032DDC: .4byte 0x020239f8 @@ -82141,7 +82141,7 @@ _08032EC6: lsls r0, 2 ldr r1, _08033004 adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r4, _08033008 mov r1, r9 ldrb r0, [r1] @@ -82197,7 +82197,7 @@ _08032F58: lsls r0, 2 ldr r1, _08033004 adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r5, _08033008 ldrb r1, [r4] adds r0, r1, r5 @@ -82341,9 +82341,9 @@ _08033088: strb r0, [r1, 0x1] ldr r4, _080330C4 adds r0, r4, 0 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag adds r0, r4, 0 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag bl sub_80334EC _080330BC: pop {r4-r7} @@ -82450,7 +82450,7 @@ sub_8033160: @ 8033160 lsls r0, 2 ldr r4, _080331C8 adds r0, r4 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] @@ -82458,7 +82458,7 @@ sub_8033160: @ 8033160 adds r0, r1 lsls r0, 2 adds r0, r4 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldrb r0, [r6] bl sub_8032A08 ldr r1, _080331CC @@ -82604,7 +82604,7 @@ _080332AC: _080332B4: .4byte 0x02020004 _080332B8: .4byte 0x03004340 _080332BC: .4byte 0x02024a60 -_080332C0: .4byte nullsub_2 +_080332C0: .4byte SpriteCallbackDummy _080332C4: .4byte 0x02017800 _080332C8: .4byte 0x03004330 _080332CC: .4byte sub_80332D0 @@ -82669,9 +82669,9 @@ sub_8033308: @ 8033308 strb r0, [r1, 0x1] ldr r4, _080333B4 adds r0, r4, 0 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag adds r0, r4, 0 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag ldr r1, _080333B8 ldrb r0, [r5] adds r0, r1 @@ -82682,7 +82682,7 @@ sub_8033308: @ 8033308 ldr r1, _080333BC adds r0, r1 movs r1, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r4, _080333C0 ldrb r1, [r5] adds r0, r1, r4 @@ -82778,7 +82778,7 @@ _08033402: cmp r0, 0 bne _08033468 adds r0, r3, r4 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldrb r4, [r5] ldr r1, _08033478 lsls r0, r4, 1 @@ -82812,7 +82812,7 @@ _08033478: .4byte 0x02024a6a _0803347C: .4byte 0x030045c0 _08033480: .4byte 0x02020004 _08033484: .4byte 0x0300434c -_08033488: .4byte nullsub_2 +_08033488: .4byte SpriteCallbackDummy _0803348C: .4byte 0x03004330 _08033490: .4byte sub_8033308 thumb_func_end sub_80333D4 @@ -85157,7 +85157,7 @@ sub_80347B8: @ 80347B8 mov r0, r9 adds r1, r5, 0 adds r2, r4, 0 - bl AddObjectToFront + bl CreateSprite ldr r4, _080348F8 ldrb r1, [r6] adds r1, r4 @@ -85212,7 +85212,7 @@ sub_80347B8: @ 80347B8 ldr r1, _08034904 adds r2, r1 ldrb r1, [r2] - bl StartObjectImageAnim + bl StartSpriteAnim ldrb r4, [r6] lsls r0, r4, 1 ldr r2, _080348EC @@ -85369,7 +85369,7 @@ sub_803495C: @ 803495C mov r0, r9 adds r1, r5, 0 adds r2, r4, 0 - bl AddObjectToFront + bl CreateSprite ldr r4, _08034AD0 adds r4, r6, r4 strb r0, [r4] @@ -85414,7 +85414,7 @@ sub_803495C: @ 803495C ldr r1, _08034AD8 adds r6, r1 ldrb r1, [r6] - bl StartObjectImageAnim + bl StartSpriteAnim ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -85463,7 +85463,7 @@ _08034ACC: .4byte 0x02024e8c _08034AD0: .4byte 0x02024be0 _08034AD4: .4byte 0x02020004 _08034AD8: .4byte 0x02024e84 -_08034ADC: .4byte nullsub_2 +_08034ADC: .4byte SpriteCallbackDummy thumb_func_end sub_803495C thumb_func_start sub_8034AE0 @@ -85506,7 +85506,7 @@ _08034B24: lsls r0, 2 ldr r4, _08034B6C adds r0, r4 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] @@ -85514,7 +85514,7 @@ _08034B24: adds r0, r1 lsls r0, 2 adds r0, r4 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldrb r0, [r6] bl sub_8032A08 ldr r1, _08034B70 @@ -85688,7 +85688,7 @@ _08034C56: adds r0, r5, 0 movs r1, 0xB0 adds r2, r4, 0 - bl AddObjectToFront + bl CreateSprite ldr r5, _08034D98 mov r2, r8 ldrb r1, [r2] @@ -85718,7 +85718,7 @@ _08034C56: lsls r6, r1, 3 adds r0, r6, r0 ldrh r0, [r0, 0x4] - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag mov r2, r8 ldrb r1, [r2] adds r1, r5 @@ -85748,7 +85748,7 @@ _08034C56: ldr r0, _08034DA8 adds r6, r0 ldrh r0, [r6, 0x6] - bl GetObjectTileRangeStartByTag + bl GetSpriteTileStartByTag mov r2, r8 ldrb r1, [r2] adds r1, r5 @@ -85892,7 +85892,7 @@ _08034E1A: asrs r2, 16 movs r1, 0xB0 movs r3, 0x1E - bl AddObjectToFront + bl CreateSprite ldr r5, _08034F5C mov r2, r8 ldrb r1, [r2] @@ -85932,7 +85932,7 @@ _08034E1A: lsls r6, r3, 3 adds r0, r6, r0 ldrh r0, [r0, 0x4] - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag mov r2, r8 ldrb r1, [r2] adds r1, r5 @@ -85962,7 +85962,7 @@ _08034E1A: ldr r0, _08034F6C adds r6, r0 ldrh r0, [r6, 0x6] - bl GetObjectTileRangeStartByTag + bl GetSpriteTileStartByTag mov r2, r8 ldrb r1, [r2] adds r1, r5 @@ -86103,7 +86103,7 @@ _08035014: .4byte 0x02024be0 _08035018: .4byte 0x02024a60 _0803501C: .4byte 0x02020004 _08035020: .4byte sub_8078B34 -_08035024: .4byte nullsub_2 +_08035024: .4byte SpriteCallbackDummy _08035028: .4byte 0x03004330 _0803502C: .4byte sub_8032BBC thumb_func_end sub_8034F84 @@ -87626,9 +87626,9 @@ sub_8035C10: @ 8035C10 orrs r0, r1 strh r0, [r4, 0x4] adds r0, r4, 0 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite pop {r4} pop {r0} bx r0 @@ -90853,7 +90853,7 @@ _080375A0: _080375A4: .4byte 0x02020004 _080375A8: .4byte 0x02024be0 _080375AC: .4byte 0x02024a60 -_080375B0: .4byte nullsub_2 +_080375B0: .4byte SpriteCallbackDummy thumb_func_end sub_803757C thumb_func_start sub_80375B4 @@ -90900,7 +90900,7 @@ sub_80375B4: @ 80375B4 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix ldrb r0, [r5] adds r0, r6 ldrb r1, [r0] @@ -90908,7 +90908,7 @@ sub_80375B4: @ 80375B4 adds r0, r1 lsls r0, 2 adds r0, r4 - bl RemoveObjectAndFreeTiles + bl DestroySprite bl dp01_tbl4_exec_completed _08037624: pop {r4-r6} @@ -90918,7 +90918,7 @@ _08037624: _0803762C: .4byte 0x02020004 _08037630: .4byte 0x02024be0 _08037634: .4byte 0x02024a60 -_08037638: .4byte nullsub_2 +_08037638: .4byte SpriteCallbackDummy _0803763C: .4byte 0x000003ff _08037640: .4byte 0xfffffc00 thumb_func_end sub_80375B4 @@ -90996,7 +90996,7 @@ _080376C4: .4byte 0x020239f8 _080376C8: .4byte 0x02020004 _080376CC: .4byte 0x03004340 _080376D0: .4byte 0x02024a60 -_080376D4: .4byte nullsub_2 +_080376D4: .4byte SpriteCallbackDummy _080376D8: ldr r2, _080377D8 ldr r5, _080377DC @@ -91105,9 +91105,9 @@ _08037720: strb r4, [r0, 0x1] ldr r4, _080377EC adds r0, r4, 0 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag adds r0, r4, 0 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag _080377B4: ldr r0, _080377F0 ldrh r1, [r0] @@ -91128,7 +91128,7 @@ _080377B4: _080377D8: .4byte 0x02020004 _080377DC: .4byte 0x03004340 _080377E0: .4byte 0x02024a60 -_080377E4: .4byte nullsub_2 +_080377E4: .4byte SpriteCallbackDummy _080377E8: .4byte 0x02017810 _080377EC: .4byte 0x000027f9 _080377F0: .4byte 0x020239f8 @@ -91304,7 +91304,7 @@ _0803791A: lsls r0, 2 ldr r1, _08037A60 adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r0, _08037A64 mov r8, r0 ldrb r0, [r5] @@ -91362,7 +91362,7 @@ _080379B2: lsls r0, 2 ldr r1, _08037A60 adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r5, _08037A64 ldrb r1, [r4] adds r0, r1, r5 @@ -91507,9 +91507,9 @@ _08037AE4: strb r0, [r1, 0x1] ldr r4, _08037B20 adds r0, r4, 0 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag adds r0, r4, 0 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag bl dp01_tbl4_exec_completed _08037B18: pop {r4-r7} @@ -91616,7 +91616,7 @@ sub_8037BBC: @ 8037BBC lsls r0, 2 ldr r4, _08037C24 adds r0, r4 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] @@ -91624,7 +91624,7 @@ sub_8037BBC: @ 8037BBC adds r0, r1 lsls r0, 2 adds r0, r4 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldrb r0, [r6] bl sub_8032A08 ldr r1, _08037C28 @@ -91770,7 +91770,7 @@ _08037D08: _08037D10: .4byte 0x02020004 _08037D14: .4byte 0x03004340 _08037D18: .4byte 0x02024a60 -_08037D1C: .4byte nullsub_2 +_08037D1C: .4byte SpriteCallbackDummy _08037D20: .4byte 0x02017800 _08037D24: .4byte 0x03004330 _08037D28: .4byte sub_8037D2C @@ -91835,9 +91835,9 @@ sub_8037D64: @ 8037D64 strb r0, [r1, 0x1] ldr r4, _08037E10 adds r0, r4, 0 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag adds r0, r4, 0 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag ldr r1, _08037E14 ldrb r0, [r5] adds r0, r1 @@ -91848,7 +91848,7 @@ sub_8037D64: @ 8037D64 ldr r1, _08037E18 adds r0, r1 movs r1, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r4, _08037E1C ldrb r1, [r5] adds r0, r1, r4 @@ -91944,7 +91944,7 @@ _08037E5E: cmp r0, 0 bne _08037EC4 adds r0, r3, r4 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldrb r4, [r5] ldr r1, _08037ED4 lsls r0, r4, 1 @@ -91978,7 +91978,7 @@ _08037ED4: .4byte 0x02024a6a _08037ED8: .4byte 0x030045c0 _08037EDC: .4byte 0x02020004 _08037EE0: .4byte 0x0300434c -_08037EE4: .4byte nullsub_2 +_08037EE4: .4byte SpriteCallbackDummy _08037EE8: .4byte 0x03004330 _08037EEC: .4byte sub_8037D64 thumb_func_end sub_8037E30 @@ -94384,7 +94384,7 @@ sub_8039294: @ 8039294 mov r0, r8 adds r1, r5, 0 adds r2, r4, 0 - bl AddObjectToFront + bl CreateSprite ldr r4, _080393CC ldrb r1, [r6] adds r1, r4 @@ -94430,7 +94430,7 @@ sub_8039294: @ 8039294 ldr r1, _080393D8 adds r2, r1 ldrb r1, [r2] - bl StartObjectImageAnim + bl StartSpriteAnim ldrb r4, [r6] lsls r0, r4, 1 adds r0, r7 @@ -94588,7 +94588,7 @@ sub_8039430: @ 8039430 mov r0, r9 adds r1, r5, 0 adds r2, r4, 0 - bl AddObjectToFront + bl CreateSprite ldr r4, _080395A4 adds r4, r6, r4 strb r0, [r4] @@ -94633,7 +94633,7 @@ sub_8039430: @ 8039430 ldr r1, _080395AC adds r6, r1 ldrb r1, [r6] - bl StartObjectImageAnim + bl StartSpriteAnim ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -94682,7 +94682,7 @@ _080395A0: .4byte 0x02024e8c _080395A4: .4byte 0x02024be0 _080395A8: .4byte 0x02020004 _080395AC: .4byte 0x02024e84 -_080395B0: .4byte nullsub_2 +_080395B0: .4byte SpriteCallbackDummy thumb_func_end sub_8039430 thumb_func_start sub_80395B4 @@ -94725,7 +94725,7 @@ _080395F8: lsls r0, 2 ldr r4, _08039640 adds r0, r4 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] @@ -94733,7 +94733,7 @@ _080395F8: adds r0, r1 lsls r0, 2 adds r0, r4 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldrb r0, [r6] bl sub_8032A08 ldr r1, _08039644 @@ -94909,7 +94909,7 @@ _08039724: adds r0, r6, 0 adds r1, r5, 0 adds r2, r4, 0 - bl AddObjectToFront + bl CreateSprite ldr r5, _0803987C mov r2, r8 ldrb r1, [r2] @@ -94939,7 +94939,7 @@ _08039724: lsls r6, r1, 3 adds r0, r6, r0 ldrh r0, [r0, 0x4] - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag mov r2, r8 ldrb r1, [r2] adds r1, r5 @@ -94969,7 +94969,7 @@ _08039724: ldr r0, _0803988C adds r6, r0 ldrh r0, [r6, 0x6] - bl GetObjectTileRangeStartByTag + bl GetSpriteTileStartByTag mov r2, r8 ldrb r1, [r2] adds r1, r5 @@ -95120,7 +95120,7 @@ _08039940: .4byte 0x02024be0 _08039944: .4byte 0x02024a60 _08039948: .4byte 0x02020004 _0803994C: .4byte sub_8078B34 -_08039950: .4byte nullsub_2 +_08039950: .4byte SpriteCallbackDummy _08039954: .4byte 0x03004330 _08039958: .4byte sub_80375B4 thumb_func_end sub_80398B0 @@ -96458,9 +96458,9 @@ sub_803A3A8: @ 803A3A8 orrs r0, r1 strh r0, [r4, 0x4] adds r0, r4, 0 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite pop {r4} pop {r0} bx r0 @@ -110353,7 +110353,7 @@ object_new_hidden_with_callback: @ 8040EB4 movs r1, 0xF8 movs r2, 0xA8 movs r3, 0xE - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r5, _08040EEC @@ -114216,7 +114216,7 @@ _08042C14: movs r1, 0x78 movs r2, 0x46 movs r3, 0x6 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 mov r9, r0 @@ -114246,14 +114246,14 @@ _08042C50: .align 2, 0 _08042C60: .4byte 0x02024e8c _08042C64: .4byte 0x02020004 -_08042C68: .4byte nullsub_2 +_08042C68: .4byte SpriteCallbackDummy thumb_func_end sub_8042B68 thumb_func_start sub_8042C6C sub_8042C6C: @ 8042C6C push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -114355,8 +114355,8 @@ _08042D34: adds r0, 0x3A strb r2, [r0] bl ResetTasks - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes ldr r0, _08042D80 bl SetVBlankCallback ldr r1, _08042D84 @@ -114436,11 +114436,11 @@ _08042E18: .4byte 0x03001770 _08042E1C: .4byte 0x0000043c _08042E20: ldr r0, _08042E34 - bl LoadObjectPic + bl LoadSpriteSheet ldr r0, _08042E38 - bl LoadObjectPic + bl LoadSpriteSheet ldr r0, _08042E3C - bl LoadTaggedObjectPalette + bl LoadSpritePalette b _08042F04 .align 2, 0 _08042E34: .4byte gUnknown_0820A3B0 @@ -114451,7 +114451,7 @@ _08042E40: movs r1, 0x78 movs r2, 0x4B movs r3, 0x5 - bl AddObjectToFront + bl CreateSprite ldr r2, _08042E68 ldr r1, [r2] strb r0, [r1] @@ -114791,7 +114791,7 @@ _08043112: b _080432BA .align 2, 0 _0804311C: .4byte 0x02020004 -_08043120: .4byte nullsub_2 +_08043120: .4byte SpriteCallbackDummy _08043124: ldr r0, [r5] ldrb r1, [r0, 0x4] @@ -114977,8 +114977,8 @@ _080432A8: bl SetMainCallback2 _080432BA: bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably add sp, 0x8 pop {r3-r5} @@ -115030,7 +115030,7 @@ _08043304: bl audio_play adds r0, r4, 0 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim bl sub_80435FC _08043334: pop {r4} @@ -115083,7 +115083,7 @@ _0804336C: bl audio_play adds r0, r4, 0 movs r1, 0x2 - bl StartObjectImageAnim + bl StartSpriteAnim _08043398: pop {r4} pop {r0} @@ -115166,7 +115166,7 @@ _08043418: bl audio_play adds r0, r4, 0 movs r1, 0x2 - bl StartObjectImageAnim + bl StartSpriteAnim bl sub_80435FC bl sub_80435FC _0804344C: @@ -115300,7 +115300,7 @@ sub_8043504: @ 8043504 lsls r0, 2 adds r0, r4 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim _08043540: movs r2, 0x2E ldrsh r0, [r5, r2] @@ -115349,7 +115349,7 @@ _08043586: _08043594: .4byte 0x02020004 _08043598: .4byte 0x0300481c _0804359C: .4byte 0x0000ffff -_080435A0: .4byte nullsub_2 +_080435A0: .4byte SpriteCallbackDummy thumb_func_end sub_8043504 thumb_func_start sub_80435A4 @@ -115395,7 +115395,7 @@ _080435D0: cmp r0, 0 ble _080435F6 adds r0, r2, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080435F6: pop {r4} pop {r0} @@ -115483,7 +115483,7 @@ sub_8043654: @ 8043654 adds r1, r4, 0 adds r2, r5, 0 movs r3, 0x4 - bl AddObjectToFront + bl CreateSprite adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -115498,7 +115498,7 @@ sub_8043654: @ 8043654 mov r1, r9 strh r1, [r0, 0x34] mov r1, r10 - bl StartObjectImageAnim + bl StartSpriteAnim pop {r3-r5} mov r8, r3 mov r9, r4 @@ -115853,14 +115853,14 @@ battle_make_oam_normal_battle: @ 8043914 movs r1, 0xF0 movs r2, 0xA0 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r6, r0, 24 adds r0, r4, 0 movs r1, 0xF0 movs r2, 0xA0 movs r3, 0x1 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r7, r0, 24 ldr r4, _080439A0 @@ -115903,14 +115903,14 @@ _080439AC: movs r1, 0xF0 movs r2, 0xA0 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r6, r0, 24 adds r0, r4, 0 movs r1, 0xF0 movs r2, 0xA0 movs r3, 0x1 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r7, r0, 24 ldr r0, _08043A18 @@ -115973,7 +115973,7 @@ _08043A28: movs r1, 0xF0 movs r2, 0xA0 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r6, r0, 24 mov r0, r10 @@ -115988,7 +115988,7 @@ _08043A28: movs r1, 0xF0 movs r2, 0xA0 movs r3, 0x1 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r7, r0, 24 ldr r4, _08043ABC @@ -116042,7 +116042,7 @@ _08043ACC: movs r1, 0xF0 movs r2, 0xA0 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r6, r0, 24 mov r0, r10 @@ -116057,7 +116057,7 @@ _08043ACC: movs r1, 0xF0 movs r2, 0xA0 movs r3, 0x1 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r7, r0, 24 ldr r4, _08043C18 @@ -116104,7 +116104,7 @@ _08043B50: movs r1, 0x8C movs r2, 0x3C movs r3, 0 - bl AddObjectToBack + bl CreateSpriteAtEnd adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 @@ -116122,7 +116122,7 @@ _08043B50: ldr r0, _08043C30 adds r1, r0 adds r0, r4, 0 - bl SetSpriteOamTables_NoPriorityFromTable + bl SetSubspriteTables adds r2, r4, 0 adds r2, 0x42 ldrb r1, [r2] @@ -116210,7 +116210,7 @@ battle_make_oam_safari_battle: @ 8043C3C movs r1, 0xF0 movs r2, 0xA0 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 @@ -116218,7 +116218,7 @@ battle_make_oam_safari_battle: @ 8043C3C movs r1, 0xF0 movs r2, 0xA0 movs r3, 0x1 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 ldr r1, _08043CCC @@ -116519,16 +116519,16 @@ sub_8043E70: @ 8043E70 adds r0, r1 lsls r0, 2 adds r0, r5 - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r0, 0x38 ldrsh r1, [r4, r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r5 - bl RemoveObjectAndFreeTiles + bl DestroySprite adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite pop {r4,r5} pop {r0} bx r0 @@ -117520,7 +117520,7 @@ _0804466C: .4byte 0x02024a68 _08044670: .4byte 0x02020004 _08044674: .4byte 0x02024a6a _08044678: .4byte 0x03004340 -_0804467C: .4byte nullsub_2 +_0804467C: .4byte SpriteCallbackDummy _08044680: .4byte 0x02017800 _08044684: .4byte 0x020239f8 _08044688: .4byte 0x06010000 @@ -117803,13 +117803,13 @@ _080448B4: bl LoadCompressedObjectPic ldr r0, _0804493C adds r0, r4, r0 - bl LoadObjectPic + bl LoadSpriteSheet ldr r0, _08044940 adds r0, r4, r0 - bl LoadTaggedObjectPalette + bl LoadSpritePalette ldr r0, _08044944 adds r0, r4, r0 - bl LoadTaggedObjectPalette + bl LoadSpritePalette mov r1, r9 adds r0, r1, r7 lsls r0, 3 @@ -117820,7 +117820,7 @@ _080448B4: ldr r3, [sp, 0x24] asrs r2, r3, 16 movs r3, 0xA - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x18] @@ -117832,7 +117832,7 @@ _080448B4: adds r4, r0, r1 ldr r1, _08044950 adds r0, r4, 0 - bl SetSpriteOamTables_NoPriorityFromTable + bl SetSubspriteTables mov r0, r8 strh r0, [r4, 0x24] strh r5, [r4, 0x2E] @@ -117886,7 +117886,7 @@ _08044970: asrs r1, r5, 16 asrs r2, 16 movs r3, 0x9 - bl AddObjectToBack + bl CreateSpriteAtEnd strb r0, [r4] ldr r0, [sp, 0x10] cmp r0, 0 @@ -118488,7 +118488,7 @@ _08044DFA: ldr r1, _08044E44 str r1, [r3] ldr r1, _08044E48 - bl SetSpriteOamTables_NoPriorityFromTable + bl SetSubspriteTables ldr r1, _08044E4C ldr r0, [sp, 0xC] add r0, r8 @@ -118609,14 +118609,14 @@ _08044EFA: lsls r0, 2 ldr r4, _08044F48 adds r0, r4 - bl RemoveObjectAndFreeResources + bl DestroySpriteAndFreeResources mov r0, sp ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r4 - bl RemoveObjectAndFreeResources + bl DestroySpriteAndFreeResources movs r5, 0x1 _08044F2A: mov r1, sp @@ -118626,7 +118626,7 @@ _08044F2A: adds r0, r1 lsls r0, 2 adds r0, r4 - bl RemoveObjectAndFreeTiles + bl DestroySprite adds r5, 0x1 cmp r5, 0x5 ble _08044F2A @@ -118708,14 +118708,14 @@ _08044FBE: lsls r0, 2 ldr r4, _08045008 adds r0, r4 - bl RemoveObjectAndFreeResources + bl DestroySpriteAndFreeResources mov r0, sp ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r4 - bl RemoveObjectAndFreeResources + bl DestroySpriteAndFreeResources movs r5, 0x1 _08044FEE: mov r1, sp @@ -118725,7 +118725,7 @@ _08044FEE: adds r0, r1 lsls r0, 2 adds r0, r4 - bl RemoveObjectAndFreeTiles + bl DestroySprite adds r5, 0x1 cmp r5, 0x5 ble _08044FEE @@ -118880,7 +118880,7 @@ _08045106: pop {r0} bx r0 .align 2, 0 -_0804510C: .4byte nullsub_2 +_0804510C: .4byte SpriteCallbackDummy thumb_func_end sub_804507C thumb_func_start sub_8045110 @@ -118943,7 +118943,7 @@ _08045174: pop {r0} bx r0 .align 2, 0 -_0804517C: .4byte nullsub_2 +_0804517C: .4byte SpriteCallbackDummy thumb_func_end sub_8045110 thumb_func_start sub_8045180 @@ -121076,7 +121076,7 @@ sub_8046234: @ 8046234 lsrs r4, r2, 24 ldr r5, _0804636C ldrh r0, [r5, 0x6] - bl GetObjectTileRangeStartByTag + bl GetSpriteTileStartByTag lsls r0, 16 ldr r1, _08046370 cmp r0, r1 @@ -121115,7 +121115,7 @@ _08046266: adds r1, r6, 0 adds r2, r4, 0 movs r3, 0x2 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -121129,12 +121129,12 @@ _08046266: adds r0, 0x1 strh r0, [r5, 0x2E] adds r0, r1, 0 - bl AnimateObject + bl AnimateSprite mov r0, r9 mov r1, r10 adds r2, r4, 0 movs r3, 0x2 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r4, r0, 4 @@ -121149,14 +121149,14 @@ _08046266: strh r0, [r5, 0x2E] adds r0, r4, 0 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r4, 0 - bl AnimateObject + bl AnimateSprite mov r0, r9 adds r1, r6, 0 adds r2, r7, 0 movs r3, 0x2 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r4, r0, 4 @@ -121171,14 +121171,14 @@ _08046266: strh r0, [r5, 0x2E] adds r0, r4, 0 movs r1, 0x2 - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r4, 0 - bl AnimateObject + bl AnimateSprite mov r0, r9 mov r1, r10 adds r2, r7, 0 movs r3, 0x2 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r4, r0, 4 @@ -121193,9 +121193,9 @@ _08046266: strh r0, [r5, 0x2E] adds r0, r4, 0 movs r1, 0x3 - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r4, 0 - bl AnimateObject + bl AnimateSprite mov r0, r8 pop {r3-r5} mov r8, r3 @@ -121224,16 +121224,16 @@ sub_8046388: @ 8046388 bne _080463C0 ldr r0, _080463B4 ldrh r0, [r0, 0x6] - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag ldr r0, _080463B8 ldrh r0, [r0, 0x4] - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag movs r1, 0x30 ldrsh r0, [r4, r1] cmp r0, 0 bne _080463BC adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite b _080463C0 .align 2, 0 _080463B4: .4byte gUnknown_081FAEA4 @@ -121246,7 +121246,7 @@ _080463C0: pop {r0} bx r0 .align 2, 0 -_080463C8: .4byte nullsub_2 +_080463C8: .4byte SpriteCallbackDummy thumb_func_end sub_8046388 thumb_func_start sub_80463CC @@ -121270,7 +121270,7 @@ sub_80463CC: @ 80463CC subs r1, 0x1 strh r1, [r0, 0x2E] adds r0, r3, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080463F6: pop {r0} bx r0 @@ -121404,7 +121404,7 @@ _080464D6: movs r1, 0x20 movs r2, 0x50 movs r3, 0x1D - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r7, r0, 24 ldr r2, _08046550 @@ -121566,7 +121566,7 @@ objc_0804ABD4: @ 8046634 mov r8, r0 adds r0, r7, 0 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim adds r2, r7, 0 adds r2, 0x2C ldrb r0, [r2] @@ -121666,7 +121666,7 @@ sub_80466F4: @ 80466F4 ldr r4, _0804675C adds r0, r4 movs r1, 0x2 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim movs r1, 0x3A ldrsh r0, [r6, r1] adds r0, r5 @@ -121675,7 +121675,7 @@ sub_80466F4: @ 80466F4 adds r0, r1 lsls r0, 2 adds r0, r4 - bl AnimateObject + bl AnimateSprite movs r1, 0x3A ldrsh r0, [r6, r1] adds r0, r5 @@ -121727,7 +121727,7 @@ _08046778: bge _080467D0 adds r0, r4, 0 movs r1, 0x2 - bl StartObjectImageAnim + bl StartSpriteAnim movs r2, 0x3A ldrsh r0, [r4, r2] adds r0, r5 @@ -121969,7 +121969,7 @@ sub_8046944: @ 8046944 strb r0, [r2] adds r0, r4, 0 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim ldr r0, _08046980 str r0, [r4, 0x1C] movs r0, 0x17 @@ -122059,12 +122059,12 @@ _080469E6: bge _08046A22 adds r0, r4, 0 movs r1, 0x2 - bl sub_8002068 + bl ChangeSpriteAffineAnim b _08046ACA _08046A22: adds r0, r4, 0 movs r1, 0x1 - bl sub_8002068 + bl ChangeSpriteAffineAnim b _08046ACA _08046A2C: adds r0, r4, 0 @@ -122130,21 +122130,21 @@ _08046A84: strh r0, [r4, 0x34] adds r0, r4, 0 movs r1, 0x3 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim movs r1, 0x36 ldrsh r0, [r4, r1] cmp r0, 0 bge _08046ABC adds r0, r4, 0 movs r1, 0x2 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim b _08046AC4 .align 2, 0 _08046AB8: .4byte 0xffffff00 _08046ABC: adds r0, r4, 0 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim _08046AC4: movs r0, 0x17 bl audio_play @@ -122353,7 +122353,7 @@ sub_8046C78: @ 8046C78 lsrs r5, r0, 24 adds r0, r6, 0 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r5, 0 bl sub_8047978 lsls r0, 16 @@ -122547,7 +122547,7 @@ _08046E1C: ldr r4, _08046E78 adds r0, r4 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim movs r3, 0x3A ldrsh r0, [r6, r3] adds r0, r5 @@ -122556,7 +122556,7 @@ _08046E1C: adds r0, r1 lsls r0, 2 adds r0, r4 - bl AnimateObject + bl AnimateSprite movs r1, 0x3A ldrsh r0, [r6, r1] adds r0, r5 @@ -122649,7 +122649,7 @@ _08046EDE: bge _08046F08 adds r0, r1, 0 movs r1, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim movs r7, 0x1 b _08046F24 .align 2, 0 @@ -122704,9 +122704,9 @@ _08046F24: ands r0, r2 strb r0, [r1] adds r0, r5, 0 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix adds r0, r5, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r3, 0 movs r5, 0x8 adds r2, r4, 0 @@ -122788,7 +122788,7 @@ _08046FF4: ldrb r0, [r0, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix movs r1, 0x3A ldrsh r0, [r6, r1] adds r0, r4 @@ -122797,9 +122797,9 @@ _08046FF4: adds r0, r1 lsls r0, 2 adds r0, r5 - bl RemoveObjectAndFreeTiles + bl DestroySprite adds r0, r6, 0 - bl RemoveObjectAndFreeResources + bl DestroySpriteAndFreeResources ldr r0, _08047068 ldr r1, _0804706C adds r0, r1 @@ -122917,7 +122917,7 @@ sub_80470C4: @ 80470C4 strh r7, [r5, 0x32] adds r0, r5, 0 movs r1, 0x4 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim _08047126: ldrh r4, [r5, 0x2E] adds r0, r5, 0 @@ -123039,7 +123039,7 @@ _08047216: str r0, [r5, 0x1C] adds r0, r5, 0 movs r1, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim _08047220: pop {r3} mov r8, r3 @@ -123199,7 +123199,7 @@ AddTextPrinterForMessage: @ 80472F0 mov r1, r9 mov r2, r10 adds r3, r4, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r3, _080473C8 @@ -123302,7 +123302,7 @@ _0804740A: _0804740C: adds r0, r6, 0 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim ldrh r0, [r6, 0x20] lsls r0, 24 lsrs r0, 24 @@ -123339,9 +123339,9 @@ _0804740C: strb r0, [r2] adds r0, r4, 0 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim adds r0, r4, 0 - bl AnimateObject + bl AnimateSprite movs r0, 0x80 lsls r0, 5 strh r0, [r4, 0x30] @@ -123398,7 +123398,7 @@ _080474B6: bge _080474D8 adds r0, r5, 0 movs r1, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim movs r1, 0x1 mov r12, r1 _080474D8: @@ -123483,7 +123483,7 @@ _0804755A: cmp r6, 0 beq _08047578 adds r0, r4, 0 - bl RemoveObjectAndFreeResources + bl DestroySpriteAndFreeResources _08047578: pop {r4-r7} pop {r0} @@ -123532,7 +123532,7 @@ sub_8047580: @ 8047580 adds r1, r6, 0 mov r2, r8 adds r3, r4, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r6, _08047630 @@ -123615,7 +123615,7 @@ _08047672: _08047674: adds r0, r4, 0 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim ldrh r0, [r4, 0x20] lsls r0, 24 lsrs r0, 24 @@ -123645,9 +123645,9 @@ _08047674: adds r4, r0 adds r0, r4, 0 movs r1, 0x2 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim adds r0, r4, 0 - bl AnimateObject + bl AnimateSprite strh r5, [r4, 0x30] b _080476D4 .align 2, 0 @@ -123694,7 +123694,7 @@ _080476F8: bge _0804773C adds r0, r5, 0 movs r1, 0x2 - bl StartObjectImageAnim + bl StartSpriteAnim adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] @@ -123740,13 +123740,13 @@ _08047768: pop {r0} bx r0 .align 2, 0 -_0804776C: .4byte nullsub_2 +_0804776C: .4byte SpriteCallbackDummy thumb_func_end sub_8047754 thumb_func_start obj_delete_and_free_associated_resources_ obj_delete_and_free_associated_resources_: @ 8047770 push {lr} - bl RemoveObjectAndFreeResources + bl DestroySpriteAndFreeResources pop {r0} bx r0 thumb_func_end obj_delete_and_free_associated_resources_ @@ -123865,7 +123865,7 @@ _0804784E: pop {r0} bx r0 .align 2, 0 -_08047854: .4byte nullsub_2 +_08047854: .4byte SpriteCallbackDummy thumb_func_end sub_8047830 thumb_func_start sub_8047858 @@ -123930,7 +123930,7 @@ oamc_804BEB4: @ 804789C strh r2, [r1, 0x24] strh r2, [r1, 0x26] adds r0, r3, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080478D4: pop {r0} bx r0 @@ -123947,7 +123947,7 @@ sub_80478DC: @ 80478DC lsls r6, r4, 3 adds r5, r6, r0 ldrh r0, [r5, 0x6] - bl GetObjectTileRangeStartByTag + bl GetSpriteTileStartByTag lsls r0, 16 ldr r1, _0804793C cmp r0, r1 @@ -123971,7 +123971,7 @@ _08047914: lsls r0, r4, 3 adds r0, r1 ldrh r0, [r0, 0x6] - bl GetObjectTileRangeStartByTag + bl GetSpriteTileStartByTag adds r1, r0, 0 lsls r1, 16 ldr r0, _08047944 @@ -124000,11 +124000,11 @@ sub_804794C: @ 804794C lsrs r4, 21 adds r0, r4, r0 ldrh r0, [r0, 0x6] - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag ldr r0, _08047974 adds r4, r0 ldrh r0, [r4, 0x4] - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag pop {r4} pop {r0} bx r0 @@ -124591,7 +124591,7 @@ _08047D86: mov r3, r8 ldrb r2, [r3] movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite movs r7, 0x80 lsls r7, 14 adds r4, r7 @@ -124643,7 +124643,7 @@ _08047DEE: mov r3, r8 ldrb r2, [r3] movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite movs r7, 0x80 lsls r7, 14 adds r4, r7 @@ -124690,7 +124690,7 @@ _08047E50: mov r0, sp movs r2, 0x98 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite movs r2, 0x80 lsls r2, 14 adds r6, r2 @@ -124717,7 +124717,7 @@ _08047E84: mov r0, sp movs r2, 0x96 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite movs r7, 0x80 lsls r7, 14 adds r6, r7 @@ -124785,8 +124785,8 @@ _08047F48: ldr r6, _0804801C str r6, [r5] bl sub_804AA88 - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes bl ResetTasks ldr r0, [r5] adds r0, 0xC8 @@ -125263,7 +125263,7 @@ _08048360: ldrb r2, [r2, 0x1] lsls r2, 3 movs r3, 0x2 - bl AddObjectToFront + bl CreateSprite ldr r2, _080483AC ldr r1, [r2] adds r1, 0x40 @@ -125412,8 +125412,8 @@ _080484A8: strb r4, [r0] _080484C6: bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably add sp, 0x14 pop {r3} @@ -125480,8 +125480,8 @@ _0804857C: ldr r5, _08048630 ldr r6, _08048634 str r6, [r5] - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes bl ResetTasks ldr r0, [r5] adds r0, 0xC8 @@ -125867,7 +125867,7 @@ _080488B8: ldrb r2, [r2] lsls r2, 3 movs r3, 0x2 - bl AddObjectToFront + bl CreateSprite ldr r1, [r4] adds r1, 0x40 strb r0, [r1] @@ -125973,8 +125973,8 @@ _080489B0: strb r4, [r0] _080489CA: bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably add sp, 0x8 pop {r3} @@ -125995,8 +125995,8 @@ sub_80489F4: @ 80489F4 ldr r0, [r0] adds r0, 0xC8 bl sub_804A940 - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -126120,8 +126120,8 @@ sub_8048AB4: @ 8048AB4 lsrs r0, 24 strh r0, [r4] bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r4} pop {r0} @@ -127444,7 +127444,7 @@ sub_8049560: @ 8049560 ldr r4, _080495B4 adds r0, r4 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r2, [r5] adds r2, 0x40 ldrb r1, [r2] @@ -127476,7 +127476,7 @@ _080495B8: ldr r5, _08049618 adds r0, r5 movs r1, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r4, [r4] adds r4, 0x40 ldrb r0, [r4] @@ -130326,7 +130326,7 @@ _0804AC40: lsls r0, 3 ldr r1, _0804AC5C adds r0, r1 - bl LoadObjectPic + bl LoadSpriteSheet ldr r1, [r4] adds r2, r1, 0 adds r2, 0x7E @@ -130336,7 +130336,7 @@ _0804AC40: _0804AC5C: .4byte gUnknown_0820C07C _0804AC60: ldr r0, _0804AC6C - bl LoadTaggedObjectPalette + bl LoadSpritePalette ldr r0, _0804AC70 ldr r1, [r0] b _0804ACC2 @@ -130345,7 +130345,7 @@ _0804AC6C: .4byte gUnknown_0820C0E4 _0804AC70: .4byte 0x03004824 _0804AC74: ldr r0, _0804AC80 - bl LoadTaggedObjectPalette + bl LoadSpritePalette ldr r0, _0804AC84 ldr r1, [r0] b _0804ACC2 @@ -130354,7 +130354,7 @@ _0804AC80: .4byte gUnknown_0820C12C _0804AC84: .4byte 0x03004824 _0804AC88: ldr r0, _0804ACA8 - bl LoadObjectPic + bl LoadSpriteSheet ldr r0, _0804ACAC ldr r1, [r0] adds r1, 0xB4 @@ -130379,7 +130379,7 @@ _0804ACB0: lsls r0, 3 ldr r1, _0804ACD4 adds r0, r1 - bl LoadObjectPic + bl LoadSpriteSheet ldr r1, [r4] _0804ACC2: adds r1, 0xB4 @@ -130933,7 +130933,7 @@ sub_804B0BC: @ 804B0BC cmp r1, 0xA bne _0804B0DA adds r0, r2, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _0804B0DA: pop {r0} bx r0 @@ -130954,7 +130954,7 @@ sub_804B0E0: @ 804B0E0 cmp r1, 0xA bne _0804B0FE adds r0, r2, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _0804B0FE: pop {r0} bx r0 @@ -131105,8 +131105,8 @@ _0804B20C: sub_804B210: @ 804B210 push {lr} bl sub_804B1BC - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -131318,7 +131318,7 @@ _0804B3A4: movs r1, 0x78 movs r2, 0x3C movs r3, 0x6 - bl AddObjectToFront + bl CreateSprite ldr r4, _0804B410 ldr r1, [r4] adds r1, 0xB8 @@ -131362,7 +131362,7 @@ _0804B3FA: _0804B40C: .4byte 0x02024e8c _0804B410: .4byte 0x03004828 _0804B414: .4byte 0x02020004 -_0804B418: .4byte nullsub_2 +_0804B418: .4byte SpriteCallbackDummy thumb_func_end sub_804B2D0 thumb_func_start sub_804B41C @@ -131412,8 +131412,8 @@ _0804B47C: ldr r6, _0804B570 ldr r5, _0804B574 str r5, [r6] - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes ldr r0, _0804B578 bl SetVBlankCallback bl sub_804B228 @@ -131674,9 +131674,9 @@ _0804B6E0: .4byte 0x0000043c _0804B6E4: bl sub_804C164 ldr r0, _0804B704 - bl LoadObjectPic + bl LoadSpriteSheet ldr r0, _0804B708 - bl LoadTaggedObjectPalette + bl LoadSpritePalette ldr r1, _0804B70C ldr r2, _0804B710 adds r0, r2, 0 @@ -131734,8 +131734,8 @@ _0804B75C: bl SetMainCallback2 _0804B76E: bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably add sp, 0x4 pop {r4-r6} @@ -131814,8 +131814,8 @@ _0804B7F4: ldr r5, _0804B8F4 ldr r0, _0804B8F8 str r0, [r5] - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes ldr r0, _0804B8FC bl SetVBlankCallback bl sub_804B228 @@ -131945,9 +131945,9 @@ _0804B964: .4byte 0x0000043c _0804B968: bl sub_804C164 ldr r0, _0804B988 - bl LoadObjectPic + bl LoadSpriteSheet ldr r0, _0804B98C - bl LoadTaggedObjectPalette + bl LoadSpritePalette ldr r1, _0804B990 ldr r2, _0804B994 adds r0, r2, 0 @@ -132005,8 +132005,8 @@ _0804B9E0: bl SetMainCallback2 _0804B9F2: bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably add sp, 0x10 pop {r3} @@ -132239,8 +132239,8 @@ sub_804BBCC: @ 804BBCC push {lr} bl sub_804C29C bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r0} bx r0 @@ -132895,17 +132895,17 @@ _0804C160: .4byte 0x03004828 sub_804C164: @ 804C164 push {lr} ldr r0, _0804C190 - bl LoadObjectPic + bl LoadSpriteSheet ldr r0, _0804C194 - bl LoadObjectPic + bl LoadSpriteSheet ldr r0, _0804C198 - bl LoadObjectPic + bl LoadSpriteSheet ldr r0, _0804C19C - bl LoadObjectPic + bl LoadSpriteSheet ldr r0, _0804C1A0 - bl LoadTaggedObjectPalette + bl LoadSpritePalette ldr r0, _0804C1A4 - bl LoadTaggedObjectPalette + bl LoadSpritePalette pop {r0} bx r0 .align 2, 0 @@ -133475,7 +133475,7 @@ _0804C7D2: movs r1, 0x78 movs r2, 0x20 movs r3, 0 - bl AddObjectToFront + bl CreateSprite ldr r1, [r6] ldr r2, _0804C81C adds r1, r2 @@ -133495,12 +133495,12 @@ _0804C7D2: adds r0, r1 lsls r0, 2 adds r0, r7 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r1, [r6] bl _0804D53C .align 2, 0 _0804C810: .4byte 0x02020004 -_0804C814: .4byte nullsub_2 +_0804C814: .4byte SpriteCallbackDummy _0804C818: .4byte gUnknown_0821595C _0804C81C: .4byte 0x00000103 _0804C820: .4byte sub_804D738 @@ -133620,7 +133620,7 @@ _0804C906: movs r1, 0x78 movs r2, 0x50 movs r3, 0 - bl AddObjectToFront + bl CreateSprite ldr r1, [r6] adds r1, 0xBB strb r0, [r1] @@ -133646,7 +133646,7 @@ _0804C92C: bl _0804D570 _0804C94C: adds r0, r1, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r1, _0804C970 movs r3, 0xC8 lsls r3, 3 @@ -133695,7 +133695,7 @@ _0804C9AE: movs r1, 0x80 movs r2, 0x41 movs r3, 0 - bl AddObjectToFront + bl CreateSprite ldr r1, [r6] adds r1, 0xBC strb r0, [r1] @@ -133707,7 +133707,7 @@ _0804C9C8: movs r1, 0x80 movs r2, 0x50 movs r3, 0x3 - bl AddObjectToFront + bl CreateSprite ldr r4, _0804CA10 ldr r1, [r4] adds r1, 0xBA @@ -133716,7 +133716,7 @@ _0804C9C8: movs r1, 0x80 movs r2, 0x50 movs r3, 0 - bl AddObjectToFront + bl CreateSprite ldr r1, [r4] adds r1, 0xBB strb r0, [r1] @@ -133729,7 +133729,7 @@ _0804C9C8: ldr r1, _0804CA18 adds r0, r1 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r1, [r4] bl _0804D53C .align 2, 0 @@ -133845,7 +133845,7 @@ _0804CAE8: lsls r0, 2 ldr r4, _0804CB20 adds r0, r4 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r0, [r6] adds r0, 0xBB ldrb r1, [r0] @@ -133853,7 +133853,7 @@ _0804CAE8: adds r0, r1 lsls r0, 2 adds r0, r4 - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r0, 0x2 bl sub_804BBE8 ldr r1, [r6] @@ -133875,7 +133875,7 @@ _0804CB24: movs r1, 0x6F movs r2, 0xAA movs r3, 0 - bl AddObjectToFront + bl CreateSprite ldr r4, _0804CB6C ldr r1, [r4] adds r1, 0xBA @@ -133885,7 +133885,7 @@ _0804CB24: adds r0, r5, 0 movs r1, 0x81 movs r3, 0 - bl AddObjectToFront + bl CreateSprite ldr r1, [r4] adds r1, 0xBB strb r0, [r1] @@ -134051,7 +134051,7 @@ _0804CC68: movs r1, 0 movs r2, 0x3 movs r3, 0x3 - bl CalcVecFromObjectCenterToObjectUpperLeft + bl CalcCenterToCornerVec ldr r0, [r5] adds r0, 0xB8 ldrb r1, [r0] @@ -134060,7 +134060,7 @@ _0804CC68: lsls r0, 2 adds r0, r4 movs r1, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim b _0804CCFA .align 2, 0 _0804CCD8: .4byte 0x03004828 @@ -134076,7 +134076,7 @@ _0804CCE4: ldr r1, _0804CD88 adds r0, r1 movs r1, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim _0804CCFA: ldr r5, _0804CD8C ldr r0, [r5] @@ -134088,7 +134088,7 @@ _0804CCFA: ldr r4, _0804CD88 adds r0, r4 movs r1, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim ldr r2, [r5] adds r3, r2, 0 adds r3, 0xB8 @@ -134308,7 +134308,7 @@ _0804CEA6: adds r0, r1 lsls r0, 2 adds r0, r4 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r0, [r6] adds r0, 0xBB ldrb r1, [r0] @@ -134316,7 +134316,7 @@ _0804CEA6: adds r0, r1 lsls r0, 2 adds r0, r4 - bl RemoveObjectAndFreeTiles + bl DestroySprite b _0804D570 .align 2, 0 _0804CEE8: .4byte 0x02020004 @@ -134348,7 +134348,7 @@ _0804CEFA: movs r1, 0x80 adds r2, r4, 0 movs r3, 0x3 - bl AddObjectToFront + bl CreateSprite ldr r1, [r6] adds r1, 0xBA strb r0, [r1] @@ -134356,7 +134356,7 @@ _0804CEFA: movs r1, 0x80 adds r2, r4, 0 movs r3, 0 - bl AddObjectToFront + bl CreateSprite ldr r1, [r6] adds r1, 0xBB strb r0, [r1] @@ -134369,7 +134369,7 @@ _0804CEFA: ldr r1, _0804CF64 adds r0, r1 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim b _0804D570 .align 2, 0 _0804CF58: .4byte 0x0202f388 @@ -134482,7 +134482,7 @@ _0804D028: lsls r0, 2 ldr r4, _0804D050 adds r0, r4 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r0, [r6] adds r0, 0xBB ldrb r1, [r0] @@ -134490,7 +134490,7 @@ _0804D028: adds r0, r1 lsls r0, 2 adds r0, r4 - bl RemoveObjectAndFreeTiles + bl DestroySprite b _0804D400 .align 2, 0 _0804D050: .4byte 0x02020004 @@ -134539,7 +134539,7 @@ _0804D08E: movs r1, 0x80 movs r2, 0x41 movs r3, 0 - bl AddObjectToFront + bl CreateSprite ldr r1, [r6] adds r1, 0xBC strb r0, [r1] @@ -134565,7 +134565,7 @@ _0804D0D4: movs r1, 0x78 movs r2, 0x50 movs r3, 0 - bl AddObjectToFront + bl CreateSprite ldr r2, _0804D0F8 ldr r1, [r2] adds r1, 0xBB @@ -134596,7 +134596,7 @@ _0804D0FC: b _0804D570 _0804D11A: adds r0, r1, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r0, 0x6 bl sub_804BBE8 ldr r1, [r6] @@ -134712,7 +134712,7 @@ _0804D1F4: negs r2, r2 movs r1, 0x78 movs r3, 0 - bl AddObjectToFront + bl CreateSprite ldr r6, _0804D294 ldr r1, [r6] ldr r5, _0804D298 @@ -134745,7 +134745,7 @@ _0804D1F4: lsls r0, 2 adds r0, r4 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r0, [r6] adds r0, r5 ldrb r1, [r0] @@ -134754,7 +134754,7 @@ _0804D1F4: lsls r0, 2 adds r0, r4 movs r1, 0x2 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim ldr r0, [r6] adds r0, r5 ldrb r1, [r0] @@ -134836,7 +134836,7 @@ _0804D302: .align 2, 0 _0804D308: .4byte 0x02020004 _0804D30C: .4byte 0x00000103 -_0804D310: .4byte nullsub_2 +_0804D310: .4byte SpriteCallbackDummy _0804D314: ldr r4, _0804D3B4 ldr r0, [r6] @@ -134904,7 +134904,7 @@ _0804D314: adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix ldr r0, [r6] adds r0, r5 ldrb r1, [r0] @@ -134912,7 +134912,7 @@ _0804D314: adds r0, r1 lsls r0, 2 adds r0, r4 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r1, [r6] b _0804D53C .align 2, 0 @@ -135216,8 +135216,8 @@ _0804D614: bne _0804D622 bl RunTasks _0804D622: - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r3} mov r8, r3 @@ -135355,7 +135355,7 @@ _0804D72E: pop {r0} bx r0 .align 2, 0 -_0804D734: .4byte nullsub_2 +_0804D734: .4byte SpriteCallbackDummy thumb_func_end sub_804D6BC thumb_func_start sub_804D738 @@ -135426,7 +135426,7 @@ sub_804D7AC: @ 804D7AC bne _0804D7C0 adds r0, r4, 0 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim _0804D7C0: ldrh r0, [r4, 0x30] adds r0, 0x1 @@ -135452,7 +135452,7 @@ _0804D7C0: cmp r0, 0x17 bne _0804D7FE adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r0, _0804D808 ldr r0, [r0] adds r0, 0xC4 @@ -135539,7 +135539,7 @@ _0804D88C: bx r0 .align 2, 0 _0804D894: .4byte gUnknown_08215BA0 -_0804D898: .4byte nullsub_2 +_0804D898: .4byte SpriteCallbackDummy thumb_func_end sub_804D80C thumb_func_start sub_804D89C @@ -135905,7 +135905,7 @@ sub_804DB84: @ 804DB84 lsls r0, 2 ldr r4, _0804DC08 adds r0, r4 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r0, [r5] adds r0, 0xB9 ldrb r1, [r0] @@ -135913,7 +135913,7 @@ sub_804DB84: @ 804DB84 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix ldr r0, _0804DC0C ldrb r4, [r0] ldrb r0, [r0, 0x1] @@ -135937,8 +135937,8 @@ _0804DBE6: bl sub_804BB78 bl sub_804D63C bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r4-r6} pop {r0} @@ -135989,8 +135989,8 @@ sub_804DC18: @ 804DC18 strb r1, [r0] _0804DC64: bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r4} pop {r0} @@ -136466,8 +136466,8 @@ _0804E11A: bne _0804E128 bl RunTasks _0804E128: - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably add sp, 0x4 pop {r4,r5} @@ -136491,8 +136491,8 @@ sub_804E144: @ 804E144 bl SetMainCallback2 _0804E158: bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r0} bx r0 @@ -136663,8 +136663,8 @@ sub_804E2BC: @ 804E2BC push {lr} bl sub_80514A4 bl sub_80514F0 - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -136673,8 +136673,8 @@ sub_804E2BC: @ 804E2BC thumb_func_start sub_804E2D8 sub_804E2D8: @ 804E2D8 push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -136863,11 +136863,11 @@ _0804E484: .4byte 0x040000d4 _0804E488: .4byte 0x80000280 _0804E48C: ldr r0, _0804E4AC - bl LoadObjectPic + bl LoadSpriteSheet ldr r0, _0804E4B0 - bl LoadObjectPic + bl LoadSpriteSheet ldr r0, _0804E4B4 - bl LoadObjectPic + bl LoadSpriteSheet _0804E49E: ldr r0, _0804E4B8 _0804E4A0: @@ -136883,13 +136883,13 @@ _0804E4B4: .4byte gUnknown_08216454 _0804E4B8: .4byte 0x03004854 _0804E4BC: ldr r0, _0804E4E0 - bl LoadObjectPic + bl LoadSpriteSheet ldr r0, _0804E4E4 - bl LoadObjectPic + bl LoadSpriteSheet ldr r0, _0804E4E8 - bl LoadTaggedObjectPalette + bl LoadSpritePalette ldr r0, _0804E4EC - bl LoadTaggedObjectPalette + bl LoadSpritePalette ldr r0, _0804E4F0 ldr r1, [r0] movs r0, 0 @@ -137000,8 +137000,8 @@ _0804E5AC: lsls r0, 19 movs r5, 0 strh r5, [r0] - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes movs r0, 0 bl SetVBlankCallback ldr r4, _0804E60C @@ -137056,7 +137056,7 @@ _0804E626: ldrb r2, [r5, 0x1] ldr r0, _0804E670 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite ldr r1, [r6] adds r1, 0x5C adds r1, r4 @@ -137074,7 +137074,7 @@ _0804E626: adds r1, 0x8 lsls r1, 24 lsrs r1, 24 - bl StartObjectImageAnim + bl StartSpriteAnim adds r5, 0x2 adds r4, 0x1 cmp r4, 0x3 @@ -137163,8 +137163,8 @@ _0804E700: ldr r0, [r0] strb r4, [r0] _0804E71A: - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably add sp, 0x4 pop {r4-r6} @@ -137210,7 +137210,7 @@ sub_804E738: @ 804E738 cmp r0, 0x3 ble _0804E780 adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite b _0804E786 _0804E780: movs r0, 0x74 @@ -137658,8 +137658,8 @@ _0804EA20: .4byte _0804F0A0 .4byte _0804F0BC _0804EBBC: - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes bl ResetTasks ldr r0, _0804EC60 bl SetVBlankCallback @@ -137766,7 +137766,7 @@ _0804EC9A: ldrb r2, [r4, 0x1] ldr r0, _0804ECE0 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite ldr r1, [r6] adds r1, 0x60 adds r1, r5 @@ -137784,7 +137784,7 @@ _0804EC9A: adds r1, 0x8 lsls r1, 24 lsrs r1, 24 - bl StartObjectImageAnim + bl StartSpriteAnim adds r4, 0x2 adds r5, 0x1 cmp r5, 0x3 @@ -138195,7 +138195,7 @@ _0804F00C: negs r2, r2 movs r1, 0x78 movs r3, 0x3 - bl AddObjectToFront + bl CreateSprite b _0804F0AA .align 2, 0 _0804F01C: .4byte gUnknown_08216548 @@ -138286,8 +138286,8 @@ _0804F0BC: bl SetMainCallback2 _0804F0CE: bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably add sp, 0x4 pop {r3} @@ -138307,8 +138307,8 @@ sub_804F0F4: @ 804F0F4 lsls r1, 19 movs r0, 0 strh r0, [r1] - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes bl ResetTasks ldr r0, _0804F158 bl SetVBlankCallback @@ -138575,7 +138575,7 @@ _0804F2B6: adds r0, r1 lsls r1, r6, 24 lsrs r1, 24 - bl StartObjectImageAnim + bl StartSpriteAnim bl link_get_multiplayer_id lsls r0, 24 ldr r1, [r7] @@ -138762,7 +138762,7 @@ _0804F49A: ldrb r2, [r5, 0x1] ldr r0, _0804F4E4 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite ldr r1, [r6] adds r1, 0x60 adds r1, r4 @@ -138780,7 +138780,7 @@ _0804F49A: adds r1, 0x8 lsls r1, 24 lsrs r1, 24 - bl StartObjectImageAnim + bl StartSpriteAnim adds r5, 0x2 adds r4, 0x1 cmp r4, 0x3 @@ -139083,7 +139083,7 @@ _0804F720: negs r2, r2 movs r1, 0x78 movs r3, 0x3 - bl AddObjectToFront + bl CreateSprite ldr r0, _0804F738 ldr r1, [r0] b _0804F74C @@ -139177,8 +139177,8 @@ _0804F7D6: bl sub_804E290 _0804F7E6: bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably add sp, 0x4 pop {r3} @@ -139763,7 +139763,7 @@ sub_804FC48: @ 804FC48 subs r2, r1 adds r1, r6, 0 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r1, r0, 24 adds r2, r1, 0 @@ -139776,7 +139776,7 @@ sub_804FC48: @ 804FC48 ldr r5, _0804FCCC adds r0, r4, r5 movs r1, 0x2 - bl StartObjectImageAnim + bl StartSpriteAnim adds r5, 0x1C adds r4, r5 ldr r0, _0804FCD0 @@ -139801,7 +139801,7 @@ _0804FCD4: ldr r1, _0804FCF8 adds r0, r1 movs r1, 0 - bl StartObjectImageAnim + bl StartSpriteAnim movs r0, 0x1F bl audio_play b _0804FD18 @@ -139818,7 +139818,7 @@ _0804FCFC: ldr r1, _0804FD2C adds r0, r1 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim movs r0, 0x20 bl audio_play _0804FD18: @@ -140333,7 +140333,7 @@ _0805010A: adds r1, r3, 0x4 lsls r1, 24 lsrs r1, 24 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r0, [r4] adds r0, 0x54 ldrh r4, [r0] @@ -140489,8 +140489,8 @@ _08050218: bl SetMainCallback2 _0805027E: bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r4-r6} pop {r0} @@ -141859,8 +141859,8 @@ _08050CB6: bl sub_8051A3C bl sub_805123C bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r4-r7} pop {r0} @@ -142344,8 +142344,8 @@ _080510B6: _080510C4: bl sub_805123C bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably add sp, 0x4 pop {r4,r5} @@ -142503,8 +142503,8 @@ _08051218: _0805121E: bl sub_805123C bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r0} bx r0 @@ -142929,7 +142929,7 @@ _08051550: cmp r0, 0 beq _08051568 adds r0, r2, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _08051568: pop {r0} bx r0 @@ -142998,7 +142998,7 @@ _080515DC: adds r2, 0x50 ldr r0, _08051644 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -143066,7 +143066,7 @@ sub_8051650: @ 8051650 cmp r0, 0 beq _0805167C adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _0805167C: pop {r4} pop {r0} @@ -143102,7 +143102,7 @@ _080516A8: cmp r0, 0 beq _080516BC adds r0, r2, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080516BC: pop {r0} bx r0 @@ -143343,13 +143343,13 @@ _08051872: cmp r0, 0x3 bne _080518AC adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r0, _080518A8 movs r2, 0x14 negs r2, r2 movs r1, 0x78 movs r3, 0x2 - bl AddObjectToFront + bl CreateSprite b _080518BE .align 2, 0 _080518A8: .4byte gUnknown_0821657C @@ -143361,7 +143361,7 @@ _080518AC: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim _080518BE: ldrh r0, [r4, 0x30] strh r0, [r4, 0x26] @@ -143431,7 +143431,7 @@ _0805191E: adds r0, 0x1 strb r0, [r1] adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _0805193C: ldrh r0, [r4, 0x30] strh r0, [r4, 0x26] @@ -143956,7 +143956,7 @@ _08051CE6: lsls r0, 2 ldr r1, _08051D1C adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 @@ -144666,7 +144666,7 @@ _080522B6: movs r1, 0x8C movs r2, 0x34 movs r3, 0 - bl AddObjectToFront + bl CreateSprite ldr r7, _08052374 ldr r1, [r7] adds r1, 0x50 @@ -144690,12 +144690,12 @@ _080522B6: lsls r0, 2 add r0, r8 movs r1, 0x3 - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r6, 0 movs r1, 0xA4 movs r2, 0x34 movs r3, 0 - bl AddObjectToFront + bl CreateSprite ldr r1, [r7] adds r1, 0x51 strb r0, [r1] @@ -144711,7 +144711,7 @@ _080522B6: movs r1, 0xBC movs r2, 0x34 movs r3, 0 - bl AddObjectToFront + bl CreateSprite ldr r1, [r7] adds r1, 0x52 strb r0, [r1] @@ -144729,7 +144729,7 @@ _080522B6: lsls r0, 2 add r0, r8 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim bl sub_8052124 movs r2, 0 mov r8, r2 @@ -144739,7 +144739,7 @@ _0805236C: .4byte gUnknown_0842D4CB _08052370: .4byte gUnknown_0821645C _08052374: .4byte 0x03004854 _08052378: .4byte 0x02020004 -_0805237C: .4byte nullsub_2 +_0805237C: .4byte SpriteCallbackDummy _08052380: ldr r1, [r7] movs r2, 0xB2 @@ -144899,8 +144899,8 @@ _080524B0: thumb_func_start sub_80524BC sub_80524BC: @ 80524BC push {r4,lr} - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes bl ResetTasks ldr r0, _0805251C bl SetVBlankCallback @@ -144919,8 +144919,8 @@ sub_80524BC: @ 80524BC adds r0, r2, 0 strh r0, [r1] bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably ldr r1, _08052528 movs r0, 0xFA @@ -145657,8 +145657,8 @@ sub_8052AF8: @ 8052AF8 push {lr} bl sub_8052918 bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r0} bx r0 diff --git a/asm/rom4.s b/asm/rom4.s index 6c9d40a68..bbe71affa 100644 --- a/asm/rom4.s +++ b/asm/rom4.s @@ -3012,10 +3012,10 @@ c2_overworld_basic: @ 8054370 push {lr} bl script_env_2_run_current_script bl RunTasks - bl CallObjectCallbacks + bl AnimateSprites bl CameraUpdate bl UpdateCameraPanning - bl PrepareSpritesForOamLoad + bl BuildOamBuffer bl fade_and_return_progress_probably bl sub_8072EDC pop {r0} @@ -3541,8 +3541,8 @@ _080547F0: .4byte VBlankCB_Field thumb_func_start VBlankCB_Field VBlankCB_Field: @ 80547F4 push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl sub_8089668 bl sub_8057A58 bl copy_pal_bg_faded_to_pal_ram @@ -4023,8 +4023,8 @@ _08054BE2: ldr r0, [r1, 0x8] movs r0, 0 movs r1, 0x80 - bl ResetSpriteRange - bl LoadOamFromSprites + bl ResetOamRange + bl LoadOam add sp, 0x4 pop {r4-r7} pop {r0} @@ -4169,7 +4169,7 @@ sub_8054D4C: @ 8054D4C push {r4,lr} adds r4, r0, 0 bl ResetTasks - bl ResetAllObjectData + bl ResetSpriteData bl sub_8073B94 bl dp12_8087EA4 bl ResetCameraUpdateInfo @@ -5980,7 +5980,7 @@ sub_8055A9C: @ 8055A9C lsls r0, 2 ldr r1, _08055AE4 adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite _08055AC8: movs r0, 0 strb r0, [r5] @@ -6595,7 +6595,7 @@ sub_8055ED8: @ 8055ED8 lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl StartObjectImageAnim + bl StartSpriteAnim b _08055F56 .align 2, 0 _08055F3C: .4byte 0x02029818 @@ -6607,7 +6607,7 @@ _08055F44: lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl StartObjectImageAnimIfDifferent + bl StartSpriteAnimIfDifferent _08055F56: adds r0, r5, 0 movs r1, 0 @@ -11551,7 +11551,7 @@ DrawDoorMetatileAt: @ 8057DEC lsrs r2, 16 movs r0, 0x1 adds r1, r5, 0 - bl sub_8057E88 + bl DrawMetatile movs r0, 0x1 strb r0, [r6, 0x4] _08057E14: @@ -11608,7 +11608,7 @@ _08057E64: lsls r1, r4, 4 adds r1, r5, r1 mov r2, r8 - bl sub_8057E88 + bl DrawMetatile pop {r3} mov r8, r3 pop {r4-r7} @@ -11618,8 +11618,8 @@ _08057E64: _08057E84: .4byte 0xfffffe00 thumb_func_end DrawMetatileAt - thumb_func_start sub_8057E88 -sub_8057E88: @ 8057E88 + thumb_func_start DrawMetatile +DrawMetatile: @ 8057E88 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -11830,7 +11830,7 @@ _08058010: .align 2, 0 _0805801C: .4byte 0x020211cc _08058020: .4byte 0x00003014 - thumb_func_end sub_8057E88 + thumb_func_end DrawMetatile thumb_func_start MapPosToBgTilemapOffset MapPosToBgTilemapOffset: @ 8058024 @@ -11930,7 +11930,7 @@ InitCameraUpdateCallback: @ 80580AC lsls r0, 2 ldr r1, _080580E4 adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080580C8: adds r0, r5, 0 bl AddCameraObject @@ -15717,7 +15717,7 @@ sub_8059BF4: @ 8059BF4 ldr r1, _08059C38 adds r0, r1 movs r1, 0 - bl StartObjectImageAnim + bl StartSpriteAnim pop {r4,r5} pop {r0} bx r0 @@ -15759,7 +15759,7 @@ sub_8059C3C: @ 8059C3C lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim pop {r4-r6} pop {r0} bx r0 @@ -15804,14 +15804,14 @@ sub_8059C94: @ 8059C94 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldrb r1, [r6, 0x4] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 add r0, r8 movs r1, 0x1 - bl SeekObjectImageAnim + bl SeekSpriteAnim pop {r3} mov r8, r3 pop {r4-r6} @@ -15855,7 +15855,7 @@ sub_8059D08: @ 8059D08 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim pop {r4-r6} pop {r0} bx r0 @@ -16595,7 +16595,7 @@ sub_805A2D0: @ 805A2D0 lsls r0, 2 ldr r1, _0805A344 adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite adds r0, r5, 0 bl DestroyTask _0805A336: @@ -16931,7 +16931,7 @@ _0805A596: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim _0805A5BC: movs r0, 0x1 pop {r4} @@ -17213,7 +17213,7 @@ sub_805A7BC: @ 805A7BC lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r0, _0805A804 bl sub_8072044 movs r0, 0xD @@ -17248,7 +17248,7 @@ sub_805A808: @ 805A808 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r0, _0805A854 bl sub_8072044 ldrh r0, [r5, 0x8] @@ -17398,7 +17398,7 @@ sub_805A954: @ 805A954 ldr r1, _0805AA44 adds r4, r0, r1 adds r0, r4, 0 - bl AnimateObject + bl AnimateSprite movs r0, 0 strh r0, [r4, 0x24] strh r0, [r4, 0x26] @@ -17583,7 +17583,7 @@ sub_805AAB0: @ 805AAB0 movs r1, 0 movs r2, 0 movs r3, 0x1F - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 ldr r1, _0805AB50 @@ -17603,10 +17603,10 @@ sub_805AAB0: @ 805AAB0 orrs r0, r1 strb r0, [r4, 0x1] adds r0, r4, 0 - bl obj_alloc_rotscale_entry + bl InitSpriteAffineAnim adds r0, r4, 0 movs r1, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim adds r4, 0x3E ldrb r0, [r4] movs r6, 0x4 @@ -17616,7 +17616,7 @@ sub_805AAB0: @ 805AAB0 movs r1, 0 movs r2, 0 movs r3, 0x1F - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 lsls r4, r0, 4 @@ -17629,10 +17629,10 @@ sub_805AAB0: @ 805AAB0 orrs r5, r0 strb r5, [r4, 0x1] adds r0, r4, 0 - bl obj_alloc_rotscale_entry + bl InitSpriteAffineAnim adds r0, r4, 0 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim adds r4, 0x3E ldrb r0, [r4] orrs r0, r6 @@ -18241,7 +18241,7 @@ RemoveFieldObjectInternal: @ 805AF4C adds r0, r1 lsls r0, 2 adds r0, r2 - bl RemoveObjectAndFreeTiles + bl DestroySprite add sp, 0x8 pop {r4} pop {r0} @@ -18355,7 +18355,7 @@ _0805B050: movs r1, 0 movs r2, 0 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x40 @@ -18461,7 +18461,7 @@ _0805B08C: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim _0805B13E: ldrb r0, [r5, 0xB] lsrs r0, 4 @@ -18569,7 +18569,7 @@ _0805B1E4: lsls r0, 2 adds r0, r4 adds r1, r2, 0 - bl SetSpriteOamTables_NoPriorityFromTable + bl SetSubspriteTables _0805B218: adds r0, r5, 0 _0805B21A: @@ -18806,7 +18806,7 @@ _0805B3C0: asrs r2, 16 mov r0, sp adds r3, r4, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x40 @@ -18820,7 +18820,7 @@ _0805B3C0: ldr r0, _0805B40C adds r4, r0 adds r0, r4, 0 - bl SetSpriteOamTables_NoPriorityFromTable + bl SetSubspriteTables adds r4, 0x42 ldrb r1, [r4] movs r0, 0x3F @@ -18900,7 +18900,7 @@ sub_805B410: @ 805B410 ldrsh r2, [r6, r0] mov r0, sp movs r3, 0 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 @@ -18959,7 +18959,7 @@ _0805B4FC: cmp r1, 0 beq _0805B518 adds r0, r5, 0 - bl SetSpriteOamTables_NoPriorityFromTable + bl SetSubspriteTables adds r2, r5, 0 adds r2, 0x42 ldrb r0, [r2] @@ -18982,7 +18982,7 @@ _0805B518: lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl StartObjectImageAnim + bl StartSpriteAnim _0805B53C: adds r0, r6, 0 add sp, 0x24 @@ -19359,7 +19359,7 @@ _0805B7FC: movs r1, 0 movs r2, 0 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x40 @@ -19426,7 +19426,7 @@ _0805B88A: cmp r1, 0 beq _0805B896 adds r0, r4, 0 - bl SetSpriteOamTables_NoPriorityFromTable + bl SetSubspriteTables _0805B896: ldrb r1, [r5, 0xC] lsls r1, 28 @@ -19460,7 +19460,7 @@ _0805B896: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim _0805B8DC: adds r0, r6, 0 bl sub_805B914 @@ -19734,14 +19734,14 @@ FieldObjectTurn: @ 805BAC0 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldrb r1, [r6, 0x4] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r5 movs r1, 0 - bl SeekObjectImageAnim + bl SeekSpriteAnim _0805BB06: pop {r4-r6} pop {r0} @@ -19871,7 +19871,7 @@ _0805BBC4: strb r0, [r7, 0x5] adds r0, r7, 0 adds r1, r6, 0 - bl StartObjectImageAnim + bl StartSpriteAnim _0805BBFC: pop {r4-r7} pop {r0} @@ -20146,7 +20146,7 @@ _0805BDE0: .4byte 0x02020004 thumb_func_start gpu_pal_allocator_reset__manage_upper_four gpu_pal_allocator_reset__manage_upper_four: @ 805BDE4 push {lr} - bl ResetObjectPaletteAllocator + bl FreeAllSpritePalettes ldr r1, _0805BDF4 movs r0, 0xC strb r0, [r1] @@ -20215,13 +20215,13 @@ sub_805BE58: @ 805BE58 push {r4,lr} adds r4, r0, 0 ldrh r0, [r4, 0x4] - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF bne _0805BE76 adds r0, r4, 0 - bl LoadTaggedObjectPalette + bl LoadSpritePalette lsls r0, 24 lsrs r0, 24 b _0805BE78 @@ -20798,7 +20798,7 @@ AddCameraObject: @ 805C284 movs r1, 0 movs r2, 0 movs r3, 0x4 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r2, _0805C2C4 @@ -29169,7 +29169,7 @@ _0805FE50: _0805FE56: ldrb r1, [r1] adds r0, r3, 0 - bl SeekObjectImageAnim + bl SeekSpriteAnim _0805FE5E: pop {r4} pop {r0} @@ -29197,7 +29197,7 @@ sub_805FE64: @ 805FE64 _0805FE84: adds r0, r1, 0 adds r1, r2, 0 - bl SeekObjectImageAnim + bl SeekSpriteAnim _0805FE8C: pop {r0} bx r0 @@ -33886,7 +33886,7 @@ sub_8061F5C: @ 8061F5C lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl StartObjectImageAnim + bl StartSpriteAnim add sp, 0x4 pop {r4,r5} pop {r0} @@ -35166,7 +35166,7 @@ sub_806283C: @ 806283C orrs r0, r1 strb r0, [r4, 0x1] adds r0, r4, 0 - bl obj_alloc_rotscale_entry + bl InitSpriteAffineAnim adds r2, r4, 0 adds r2, 0x2C ldrb r0, [r2] @@ -35191,7 +35191,7 @@ sub_806286C: @ 806286C ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix ldrb r0, [r4, 0x1] movs r1, 0x4 negs r1, r1 @@ -35202,7 +35202,7 @@ sub_806286C: @ 806286C lsrs r2, 6 movs r3, 0 adds r0, r4, 0 - bl CalcVecFromObjectCenterToObjectUpperLeft + bl CalcCenterToCornerVec movs r0, 0x1 pop {r4} pop {r1} @@ -35224,7 +35224,7 @@ sub_806289C: @ 806289C strb r0, [r2] adds r0, r4, 0 movs r1, 0 - bl StartObjectRotScalAnimIfDifferent + bl StartSpriteAffineAnimIfDifferent adds r0, r5, 0 adds r1, r4, 0 bl sub_80628D0 @@ -35276,7 +35276,7 @@ sub_80628FC: @ 80628FC strb r0, [r2] adds r0, r4, 0 movs r1, 0x1 - bl sub_80020A0 + bl ChangeSpriteAffineAnimIfDifferent adds r0, r5, 0 adds r1, r4, 0 bl sub_8062930 @@ -35649,7 +35649,7 @@ sub_8062B8C: @ 8062B8C lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl StartObjectImageAnimIfDifferent + bl StartSpriteAnimIfDifferent adds r0, r6, 0 bl DoShadowFieldEffect add sp, 0x4 @@ -36376,10 +36376,10 @@ sub_80630D0: @ 80630D0 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r4, 0 movs r1, 0 - bl SeekObjectImageAnim + bl SeekSpriteAnim pop {r4,r5} pop {r0} bx r0 @@ -36732,10 +36732,10 @@ sub_8063338: @ 8063338 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r4, 0 movs r1, 0 - bl SeekObjectImageAnim + bl SeekSpriteAnim pop {r4,r5} pop {r0} bx r0 @@ -39667,7 +39667,7 @@ obj_anim_image_set_and_seek: @ 806483C ands r1, r3 strb r1, [r4] adds r1, r2, 0 - bl SeekObjectImageAnim + bl SeekSpriteAnim pop {r4} pop {r0} bx r0 @@ -39876,7 +39876,7 @@ _0806499E: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim b _080649EE .align 2, 0 _080649DC: .4byte 0x02020004 @@ -52240,7 +52240,7 @@ _0806A566: b _0806A596 _0806A590: adds r0, r3, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _0806A596: pop {r0} bx r0 @@ -52373,7 +52373,7 @@ _0806A682: b _0806A696 _0806A690: adds r0, r3, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _0806A696: pop {r0} bx r0 @@ -52388,13 +52388,13 @@ sub_806A69C: @ 806A69C lsls r5, 24 lsrs r5, 24 ldr r0, _0806A70C - bl LoadTaggedObjectPalette + bl LoadSpritePalette ldr r0, _0806A710 mov r8, r0 movs r1, 0x35 movs r2, 0x44 movs r3, 0 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r1, r0, 24 ldr r6, _0806A714 @@ -52414,7 +52414,7 @@ sub_806A69C: @ 806A69C movs r1, 0x35 movs r2, 0x44 movs r3, 0 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r1, r0, 24 lsls r0, r1, 4 @@ -52447,7 +52447,7 @@ sub_806A724: @ 806A724 push {lr} ldr r0, _0806A734 ldrh r0, [r0, 0x4] - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag pop {r0} bx r0 .align 2, 0 @@ -52975,11 +52975,11 @@ _0806AB16: ldr r0, [r1, 0x8] movs r0, 0 movs r1, 0x80 - bl ResetSpriteRange - bl LoadOamFromSprites + bl ResetOamRange + bl LoadOam bl remove_some_task bl dp12_8087EA4 - bl ResetAllObjectData + bl ResetSpriteData bl ResetTasks bl sub_8073B94 ldr r4, _0806ABA0 @@ -53018,8 +53018,8 @@ _0806ABAC: .4byte sub_806ACCC sub_806ABB0: @ 806ABB0 push {lr} bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r0} bx r0 @@ -53028,8 +53028,8 @@ sub_806ABB0: @ 806ABB0 thumb_func_start sub_806ABC8 sub_806ABC8: @ 806ABC8 push {lr} - bl ProcessObjectCopyRequests - bl LoadOamFromSprites + bl ProcessSpriteCopyRequests + bl LoadOam bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -53394,8 +53394,8 @@ _0806AED8: .4byte 0x0202f388 sub_806AEDC: @ 806AEDC push {r4-r6,lr} sub sp, 0x4 - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer ldr r0, _0806AF2C ldrb r1, [r0] lsls r0, r1, 1 @@ -53435,8 +53435,8 @@ _0806AF30: .4byte gUnknown_08376BB4 thumb_func_start sub_806AF34 sub_806AF34: @ 806AF34 push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram bl sub_806B548 pop {r0} @@ -53837,7 +53837,7 @@ _0806B270: .4byte 0x00000266 _0806B274: .4byte 0x03001770 _0806B278: .4byte 0x0000043c _0806B27C: - bl ResetAllObjectData + bl ResetSpriteData b _0806B426 _0806B282: ldr r0, _0806B2A0 @@ -53860,7 +53860,7 @@ _0806B2A0: .4byte 0x0201b000 _0806B2A4: .4byte 0x03001770 _0806B2A8: .4byte 0x0000043c _0806B2AC: - bl ResetObjectPaletteAllocator + bl FreeAllSpritePalettes b _0806B426 _0806B2B2: ldr r4, _0806B2CC @@ -55256,7 +55256,7 @@ sub_806BD58: @ 806BD58 pop {r1} bx r1 .align 2, 0 -_0806BD7C: .4byte nullsub_2 +_0806BD7C: .4byte SpriteCallbackDummy thumb_func_end sub_806BD58 thumb_func_start sub_806BD80 @@ -57032,7 +57032,7 @@ _0806CAD8: .4byte 0x03004b20 _0806CADC: .4byte TaskDummy _0806CAE0: .4byte 0x02001000 _0806CAE4: .4byte sub_806CB74 -_0806CAE8: .4byte nullsub_2 +_0806CAE8: .4byte SpriteCallbackDummy _0806CAEC: .4byte 0x0001a272 _0806CAF0: .4byte 0x02020004 _0806CAF4: .4byte gUnknown_083769A8 @@ -57204,7 +57204,7 @@ sub_806CC2C: @ 806CC2C lsls r0, 2 ldr r1, _0806CC6C adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r0, 0 movs r1, 0 bl sub_806D538 @@ -59038,9 +59038,9 @@ _0806DA94: .4byte sub_806DA0C sub_806DA98: @ 806DA98 push {lr} ldr r0, _0806DAAC - bl LoadObjectPic + bl LoadSpriteSheet ldr r0, _0806DAB0 - bl LoadTaggedObjectPalette + bl LoadSpritePalette pop {r0} bx r0 .align 2, 0 @@ -59125,7 +59125,7 @@ sub_806DB0C: @ 806DB0C lsrs r3, 24 movs r1, 0xFA movs r2, 0xAA - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r4, r0, 4 @@ -59145,7 +59145,7 @@ sub_806DB0C: @ 806DB0C strh r6, [r5, 0x3C] adds r0, r5, 0 mov r1, r9 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r1, [r4] adds r0, r5, 0 bl _call_via_r1 @@ -59282,7 +59282,7 @@ _0806DC50: movs r1, 0xFA movs r2, 0xAA movs r3, 0x4 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r4, r0, 4 @@ -59343,7 +59343,7 @@ sub_806DCD4: @ 806DCD4 movs r1, 0xFA movs r2, 0xAA movs r3, 0x4 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r6, r0, 24 ldr r1, _0806DD30 @@ -59386,7 +59386,7 @@ _0806DD46: adds r0, r5, 0 movs r1, 0 _0806DD4A: - bl StartObjectImageAnim + bl StartSpriteAnim adds r2, r5, 0 adds r2, 0x3E ldrb r1, [r2] @@ -59728,7 +59728,7 @@ _0806DFD8: adds r0, r4, 0 movs r1, 0 _0806DFE6: - bl StartObjectImageAnim + bl StartSpriteAnim adds r4, 0x3E ldrb r1, [r4] movs r0, 0x5 @@ -67046,7 +67046,7 @@ _08071A98: .4byte 0x040000d4 _08071A9C: .4byte 0x81000200 _08071AA0: .4byte 0x81000800 _08071AA4: - bl ResetAllObjectData + bl ResetSpriteData bl ResetTasks bl sub_8073B94 bl dp12_8087EA4 @@ -75373,9 +75373,9 @@ _080758E4: .4byte 0x03004244 move_anim_8072740: @ 80758E8 push {r4,lr} adds r4, r0, 0 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r1, _08075904 ldrb r0, [r1] subs r0, 0x1 @@ -75601,9 +75601,9 @@ ma01_080728D0: @ 8075A78 adds r0, r1 ldrh r5, [r0, 0x6] adds r0, r5, 0 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag adds r0, r5, 0 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag ldr r0, [r6] adds r0, 0x2 str r0, [r6] @@ -75732,7 +75732,7 @@ _08075B74: lsrs r3, 24 adds r0, r7, 0 adds r1, r4, 0 - bl AddObjectAndAnimateForOneFrame + bl CreateSpriteAndAnimate ldr r1, _08075BB4 ldrb r0, [r1] adds r0, 0x1 @@ -75954,12 +75954,12 @@ _08075D36: lsls r0, 3 adds r0, r6 ldrh r0, [r0, 0x6] - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag ldrh r0, [r4] lsls r0, 3 adds r0, r6 ldrh r0, [r0, 0x6] - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag ldrh r1, [r4] adds r0, r7, 0 orrs r0, r1 @@ -81220,7 +81220,7 @@ _0807856C: move_anim_8074EE0: @ 8078574 push {r4,lr} adds r4, r0, 0 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix adds r0, r4, 0 bl move_anim_8072740 pop {r4} @@ -82569,7 +82569,7 @@ _08078F0E: lsrs r2, 6 lsls r3, 30 lsrs r3, 30 - bl CalcVecFromObjectCenterToObjectUpperLeft + bl CalcCenterToCornerVec pop {r3} mov r8, r3 pop {r4-r7} @@ -82619,7 +82619,7 @@ sub_8078F40: @ 8078F40 lsrs r2, 6 lsls r3, 30 lsrs r3, 30 - bl CalcVecFromObjectCenterToObjectUpperLeft + bl CalcCenterToCornerVec pop {r4} pop {r0} bx r0 @@ -82701,7 +82701,7 @@ sub_8078FDC: @ 8078FDC lsls r3, 30 lsrs r3, 30 adds r0, r4, 0 - bl CalcVecFromObjectCenterToObjectUpperLeft + bl CalcCenterToCornerVec _0807902A: ldr r6, _08079090 lsls r0, r7, 16 @@ -82784,7 +82784,7 @@ sub_8079098: @ 8079098 lsls r3, 30 lsrs r3, 30 adds r0, r4, 0 - bl CalcVecFromObjectCenterToObjectUpperLeft + bl CalcCenterToCornerVec add sp, 0x4 pop {r4} pop {r0} @@ -83519,7 +83519,7 @@ obj_delete_but_dont_free_vram: @ 8079658 movs r2, 0x40 orrs r1, r2 strb r1, [r3] - bl RemoveObjectAndFreeTiles + bl DestroySprite pop {r0} bx r0 thumb_func_end obj_delete_but_dont_free_vram @@ -83830,7 +83830,7 @@ sub_80798AC: @ 80798AC lsrs r4, r0, 24 ldr r0, _080798CC ldrh r0, [r0] - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF @@ -84748,7 +84748,7 @@ sub_8079F44: @ 8079F44 lsls r0, r7, 3 ldr r1, _08079FE0 adds r0, r1 - bl LoadObjectPic + bl LoadSpriteSheet lsls r0, 16 lsrs r0, 16 mov r10, r0 @@ -84758,7 +84758,7 @@ sub_8079F44: @ 8079F44 lsls r0, 3 adds r0, r1 ldrh r0, [r0, 0x2] - bl AllocObjectPalette + bl AllocSpritePalette lsls r0, 24 lsrs r4, r0, 24 mov r0, r8 @@ -84883,7 +84883,7 @@ _0807A09E: lsls r2, 16 asrs r2, 16 ldr r3, [sp, 0x14] - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r4, r0, 24 bl sub_8076BE0 @@ -84901,7 +84901,7 @@ _0807A09E: str r2, [r1] adds r0, r3 movs r1, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim _0807A0D0: adds r0, r4, 0 add sp, 0x18 @@ -84922,7 +84922,7 @@ _0807A0F0: .4byte gUnknown_081E7C18 thumb_func_start sub_807A0F4 sub_807A0F4: @ 807A0F4 push {lr} - bl RemoveObjectAndFreeResources + bl DestroySpriteAndFreeResources pop {r0} bx r0 thumb_func_end sub_807A0F4 @@ -85476,7 +85476,7 @@ sub_807A4A0: @ 807A4A0 pop {r1} bx r1 .align 2, 0 -_0807A538: .4byte nullsub_2 +_0807A538: .4byte SpriteCallbackDummy _0807A53C: .4byte 0x02020004 _0807A540: .4byte 0xfffffc00 thumb_func_end sub_807A4A0 @@ -85589,7 +85589,7 @@ _0807A5FE: strh r0, [r4, 0x38] ldrb r1, [r1, 0xC] adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r1, _0807A634 adds r0, r4, 0 bl oamt_set_x3A_32 @@ -85692,7 +85692,7 @@ _0807A6D0: subs r1, r2 strh r1, [r0, 0x24] ldr r0, _0807A73C - bl AllocObjectPalette + bl AllocSpritePalette lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x10] @@ -85853,7 +85853,7 @@ _0807A830: cmp r0, 0 bne _0807A844 ldr r0, _0807A84C - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag adds r0, r5, 0 bl move_anim_task_del _0807A844: diff --git a/asm/rom5.s b/asm/rom5.s index fe56433c3..0e54e8c19 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -156,10 +156,10 @@ _0807AEBC: .4byte 0x02000000 _0807AEC0: .4byte 0x0001fffe _0807AEC4: .4byte 0x0001ffff _0807AEC8: - bl ResetAllObjectData + bl ResetSpriteData b _0807B040 _0807AECE: - bl ResetObjectPaletteAllocator + bl FreeAllSpritePalettes ldr r1, _0807AEDC movs r0, 0x4 strb r0, [r1] @@ -585,7 +585,7 @@ _0807B1FE: adds r0, r5, 0 adds r1, r4, 0 mov r2, r8 - bl AddObjectToFront + bl CreateSprite ldr r4, _0807B2C8 adds r4, r7, r4 strb r0, [r4] @@ -637,7 +637,7 @@ _0807B1FE: ldr r1, _0807B2D4 adds r1, r7, r1 ldrb r1, [r1] - bl StartObjectImageAnim + bl StartSpriteAnim b _0807B4AC .align 2, 0 _0807B2BC: .4byte 0x02024a6a @@ -645,7 +645,7 @@ _0807B2C0: .4byte 0x030045c0 _0807B2C4: .4byte 0x02024e8c _0807B2C8: .4byte 0x02024be0 _0807B2CC: .4byte 0x02020004 -_0807B2D0: .4byte nullsub_2 +_0807B2D0: .4byte SpriteCallbackDummy _0807B2D4: .4byte 0x02024e84 _0807B2D8: ldr r2, _0807B328 @@ -725,7 +725,7 @@ _0807B338: _0807B37C: movs r1, 0x50 adds r2, r4, 0 - bl AddObjectToFront + bl CreateSprite ldr r3, _0807B3C4 strb r0, [r3] ldr r4, _0807B3C8 @@ -759,7 +759,7 @@ _0807B3BC: .4byte 0x02024e8c _0807B3C0: .4byte gUnknown_081ECAD8 _0807B3C4: .4byte 0x02024be0 _0807B3C8: .4byte 0x02020004 -_0807B3CC: .4byte nullsub_2 +_0807B3CC: .4byte SpriteCallbackDummy _0807B3D0: ldr r1, _0807B4E8 lsls r0, r7, 1 @@ -809,7 +809,7 @@ _0807B3D0: adds r0, r5, 0 adds r1, r4, 0 mov r2, r8 - bl AddObjectToFront + bl CreateSprite ldr r4, _0807B4F4 adds r4, r7, r4 strb r0, [r4] @@ -861,7 +861,7 @@ _0807B3D0: ldr r1, _0807B500 adds r1, r7, r1 ldrb r1, [r1] - bl StartObjectImageAnim + bl StartSpriteAnim _0807B4AC: ldr r1, _0807B4F8 ldr r0, _0807B4F4 @@ -900,7 +900,7 @@ _0807B4EC: .4byte 0x03004360 _0807B4F0: .4byte 0x02024e8c _0807B4F4: .4byte 0x02024be0 _0807B4F8: .4byte 0x02020004 -_0807B4FC: .4byte nullsub_2 +_0807B4FC: .4byte SpriteCallbackDummy _0807B500: .4byte 0x02024e84 _0807B504: .4byte 0x02017800 thumb_func_end sub_807B184 @@ -1142,7 +1142,7 @@ _0807B6F0: asrs r2, 16 ldr r0, _0807B758 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r4, r0, 24 lsls r0, r4, 4 @@ -1201,7 +1201,7 @@ _0807B76E: asrs r2, 16 ldr r0, _0807B7DC movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r4, r0, 24 lsls r0, r4, 4 @@ -1412,11 +1412,11 @@ _0807B8D6: cmp r0, 0 beq _0807B912 adds r0, r4, 0 - bl RemoveObjectAndFreeResources + bl DestroySpriteAndFreeResources b _0807B918 _0807B912: adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _0807B918: pop {r4} pop {r0} @@ -1470,7 +1470,7 @@ _0807B95E: lsls r2, r4, 16 asrs r2, 16 movs r3, 0x4 - bl AddObjectToFront + bl CreateSprite adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -1480,7 +1480,7 @@ _0807B95E: ldr r1, _0807B9C8 adds r0, r1 ldr r1, _0807B9CC - bl SetSpriteOamTables_NoPriorityFromTable + bl SetSubspriteTables ldr r1, _0807B9D0 lsls r0, r6, 2 adds r0, r6 @@ -1554,7 +1554,7 @@ sub_807BA24: @ 807BA24 lsls r4, 24 lsrs r4, 24 ldr r0, _0807BABC - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r2, r0, 24 ldr r1, _0807BAC0 @@ -1705,9 +1705,9 @@ sub_807BB24: @ 807BB24 ldr r0, _0807BB68 adds r4, r0 adds r0, r4, 0 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite b _0807BB7E .align 2, 0 _0807BB64: .4byte 0x03004b20 @@ -2225,7 +2225,7 @@ _0807BF36: adds r1, r5, 0 asrs r2, r7, 16 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r4, r0, 4 @@ -2235,7 +2235,7 @@ _0807BF36: adds r4, r0 adds r0, r4, 0 adds r1, r6, 0 - bl StartObjectImageAnim + bl StartSpriteAnim movs r0, 0x1 strh r0, [r4, 0x2E] adds r0, r6, 0x1 @@ -2271,7 +2271,7 @@ _0807BF92: adds r1, r4, 0 asrs r2, r6, 16 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r2, r0, 4 @@ -2283,7 +2283,7 @@ _0807BF92: lsls r1, 24 lsrs r1, 24 adds r0, r2, 0 - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -2382,7 +2382,7 @@ _0807C070: strh r0, [r1] strh r0, [r1, 0x2A] adds r0, r3, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _0807C07E: pop {r4} pop {r0} @@ -2401,7 +2401,7 @@ sub_807C088: @ 807C088 movs r1, 0 movs r2, 0x44 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r2, _0807C0C4 @@ -2429,8 +2429,8 @@ _0807C0C4: .4byte 0x02020004 sub_807C0C8: @ 807C0C8 push {lr} bl sub_8089668 - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram ldr r0, _0807C0E8 ldr r1, _0807C0EC @@ -2581,8 +2581,8 @@ _0807C1E4: bl gpu_pal_apply bl remove_some_task bl ResetTasks - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes ldr r1, _0807C29C movs r0, 0xE strb r0, [r1] @@ -2598,7 +2598,7 @@ _0807C1E4: adds r2, r5, 0 bl gpu_pal_apply ldr r0, _0807C2AC - bl LoadTaggedObjectPalette + bl LoadSpritePalette ldr r0, _0807C2B0 ldr r2, _0807C2B4 adds r0, r2 @@ -2807,8 +2807,8 @@ _0807C450: .4byte sub_807C454 sub_807C454: @ 807C454 push {lr} bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r0} bx r0 @@ -2896,7 +2896,7 @@ _0807C4DC: movs r1, 0x62 movs r2, 0x1A movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r5, _0807C574 @@ -2915,7 +2915,7 @@ _0807C4DC: movs r1, 0xA2 movs r2, 0x1A movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -3300,7 +3300,7 @@ sub_807C828: @ 807C828 bne _0807C8E4 movs r0, 0x90 lsls r0, 5 - bl AllocObjectPalette + bl AllocSpritePalette adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 @@ -3316,7 +3316,7 @@ sub_807C828: @ 807C828 adds r0, r4, r1 strb r5, [r0] ldr r0, _0807C904 - bl AllocObjectPalette + bl AllocSpritePalette ldr r2, _0807C908 adds r1, r4, r2 strb r0, [r1] @@ -6432,7 +6432,7 @@ sub_807DFD4: @ 807DFD4 cmp r0, 0x1 beq _0807E090 ldr r0, _0807E054 - bl LoadObjectPic + bl LoadSpriteSheet ldr r0, _0807E058 bl sub_807D8C0 movs r5, 0 @@ -6441,7 +6441,7 @@ _0807DFF2: movs r1, 0 movs r2, 0 movs r3, 0xFF - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 @@ -6539,7 +6539,7 @@ _0807E0B8: ldr r0, [r0] cmp r0, 0 beq _0807E0C6 - bl RemoveObjectAndFreeTiles + bl DestroySprite _0807E0C6: adds r0, r4, 0x1 lsls r0, 16 @@ -6548,7 +6548,7 @@ _0807E0C6: bls _0807E0B8 movs r0, 0x90 lsls r0, 5 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag ldr r0, _0807E0EC ldr r0, [r0] ldr r1, _0807E0F0 @@ -7158,7 +7158,7 @@ _0807E500: strh r0, [r7, 0x34] adds r0, r7, 0 movs r1, 0 - bl StartObjectImageAnim + bl StartSpriteAnim mov r3, r8 strh r3, [r7, 0x36] adds r2, r7, 0 @@ -7271,7 +7271,7 @@ _0807E64A: lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl StartObjectImageAnim + bl StartSpriteAnim movs r0, 0x1 strh r0, [r5, 0x36] ldr r1, _0807E694 @@ -7437,7 +7437,7 @@ _0807E798: sub_807E7A4: @ 807E7A4 push {lr} ldr r0, _0807E7B0 - bl LoadObjectPic + bl LoadSpriteSheet pop {r0} bx r0 .align 2, 0 @@ -7470,7 +7470,7 @@ _0807E7CE: movs r3, 0x2 ldrsh r2, [r2, r3] movs r3, 0x4E - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x40 @@ -7695,7 +7695,7 @@ _0807E98C: ldr r0, [r0] cmp r0, 0 beq _0807E99A - bl RemoveObjectAndFreeTiles + bl DestroySprite _0807E99A: adds r0, r4, 0x1 lsls r0, 16 @@ -7710,7 +7710,7 @@ _0807E9A6: movs r1, 0 strb r1, [r0] ldr r0, _0807E9C4 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag pop {r4-r7} pop {r0} bx r0 @@ -7971,7 +7971,7 @@ snowflake_add: @ 807EBA0 movs r1, 0 movs r2, 0 movs r3, 0x4E - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -8041,7 +8041,7 @@ _0807EC28: adds r1, 0x60 adds r1, r0 ldr r0, [r1] - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r0, 0x1 _0807EC3C: pop {r1} @@ -8112,7 +8112,7 @@ sub_807EC40: @ 807EC40 movs r1, 0x1 bics r1, r6 adds r0, r5, 0 - bl StartObjectImageAnim + bl StartSpriteAnim strh r7, [r5, 0x34] movs r0, 0x1 cmp r4, 0 @@ -9405,14 +9405,14 @@ sub_807F6E8: @ 807F6E8 str r0, [sp] str r1, [sp, 0x4] mov r0, sp - bl LoadObjectPic + bl LoadSpriteSheet movs r5, 0 _0807F70C: ldr r0, _0807F768 movs r1, 0 movs r2, 0 movs r3, 0xFF - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -9498,7 +9498,7 @@ _0807F7BA: ldr r0, [r0] cmp r0, 0 beq _0807F7C8 - bl RemoveObjectAndFreeTiles + bl DestroySprite _0807F7C8: adds r0, r4, 0x1 lsls r0, 16 @@ -9506,7 +9506,7 @@ _0807F7C8: cmp r4, 0x13 bls _0807F7BA ldr r0, _0807F7F4 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag ldr r0, _0807F7EC ldr r0, [r0] ldr r1, _0807F7F0 @@ -9748,7 +9748,7 @@ _0807F996: sub_807F99C: @ 807F99C push {lr} ldr r0, _0807F9A8 - bl LoadObjectPic + bl LoadSpriteSheet pop {r0} bx r0 .align 2, 0 @@ -9772,7 +9772,7 @@ _0807F9C0: movs r1, 0 movs r2, 0 movs r3, 0x4E - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -9860,7 +9860,7 @@ _0807FA6C: ldr r0, [r0] cmp r0, 0 beq _0807FA7A - bl RemoveObjectAndFreeTiles + bl DestroySprite _0807FA7A: adds r0, r4, 0x1 lsls r0, 16 @@ -9868,7 +9868,7 @@ _0807FA7A: cmp r4, 0x13 bls _0807FA6C ldr r0, _0807FAA4 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag ldr r0, _0807FAA0 ldr r0, [r0] movs r1, 0xE0 @@ -10237,7 +10237,7 @@ sub_807FD30: @ 807FD30 str r0, [sp] str r1, [sp, 0x4] mov r0, sp - bl LoadObjectPic + bl LoadSpriteSheet movs r6, 0 _0807FD54: adds r0, r6, 0 @@ -10249,7 +10249,7 @@ _0807FD54: ldr r0, _0807FDA8 movs r1, 0 movs r3, 0xFF - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -10330,7 +10330,7 @@ _0807FE00: ldr r0, [r0] cmp r0, 0 beq _0807FE0E - bl RemoveObjectAndFreeTiles + bl DestroySprite _0807FE0E: adds r0, r4, 0x1 lsls r0, 16 @@ -10338,7 +10338,7 @@ _0807FE0E: cmp r4, 0x13 bls _0807FE00 ldr r0, _0807FE38 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag ldr r0, _0807FE30 ldr r0, [r0] ldr r1, _0807FE34 @@ -10722,7 +10722,7 @@ _080800FC: ldr r0, [r0] cmp r0, 0 beq _0808010A - bl RemoveObjectAndFreeTiles + bl DestroySprite _0808010A: adds r0, r4, 0x1 lsls r0, 16 @@ -10736,7 +10736,7 @@ _0808010A: movs r1, 0 strb r1, [r0] ldr r0, _08080170 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag _08080126: ldr r0, _08080168 ldr r1, [r0] @@ -10755,7 +10755,7 @@ _0808013C: ldr r0, [r0] cmp r0, 0 beq _0808014A - bl RemoveObjectAndFreeTiles + bl DestroySprite _0808014A: adds r0, r4, 0x1 lsls r0, 16 @@ -10791,7 +10791,7 @@ sub_8080178: @ 8080178 cmp r0, 0 bne _08080226 ldr r0, _080801F0 - bl LoadObjectPic + bl LoadSpriteSheet ldr r0, _080801F4 bl sub_807D8C0 movs r7, 0 @@ -10805,7 +10805,7 @@ _08080198: ldr r0, _080801F8 movs r1, 0 movs r3, 0x1 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -10900,7 +10900,7 @@ _08080258: ldr r0, _080802E8 movs r2, 0xD0 movs r3, 0x1 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -10943,12 +10943,12 @@ _08080258: strh r0, [r1, 0x34] ldr r0, [r4] movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r0, [r4] movs r1, 0 movs r2, 0x2 movs r3, 0 - bl CalcVecFromObjectCenterToObjectUpperLeft + bl CalcCenterToCornerVec ldr r1, [r4] ldr r0, _080802F8 str r0, [r1, 0x1C] @@ -11185,7 +11185,7 @@ sub_8080474: @ 8080474 cmp r5, 0 bne _080804AC ldr r0, _080804BC - bl LoadObjectPic + bl LoadSpriteSheet movs r2, 0xE5 lsls r2, 3 adds r0, r4, r2 @@ -11332,7 +11332,7 @@ sub_8080588: @ 8080588 lsls r2, 16 asrs r2, 16 movs r3, 0 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 @@ -11396,7 +11396,7 @@ _08080616: cmp r1, r0 bne _08080630 adds r0, r2, r5 - bl RemoveObjectAndFreeTiles + bl DestroySprite _08080630: adds r0, r4, 0x1 lsls r0, 16 @@ -11404,7 +11404,7 @@ _08080630: cmp r4, 0x3F bls _08080616 ldr r0, _08080650 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag pop {r4,r5} pop {r0} bx r0 @@ -11461,7 +11461,7 @@ _08080694: cmp r0, 0x77 ble _080806AE adds r0, r1, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080806AE: pop {r0} bx r0 @@ -14269,7 +14269,7 @@ sub_8081C8C: @ 8081C8C bl CpuSet movs r0, 0 movs r1, 0x80 - bl ResetSpriteRange + bl ResetOamRange ldr r0, _08081CC4 ldrb r0, [r0] bl battle_exit_is_player_defeat @@ -14312,7 +14312,7 @@ sub_8081CEC: @ 8081CEC bl CpuSet movs r0, 0 movs r1, 0x80 - bl ResetSpriteRange + bl ResetOamRange ldr r0, _08081D24 ldrb r0, [r0] bl battle_exit_is_player_defeat @@ -19984,7 +19984,7 @@ oei_exclamation_mark: @ 80847EC movs r1, 0 movs r2, 0 movs r3, 0x53 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -20013,7 +20013,7 @@ sub_8084824: @ 8084824 movs r1, 0 movs r2, 0 movs r3, 0x52 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -20042,7 +20042,7 @@ sub_808485C: @ 808485C movs r1, 0 movs r2, 0 movs r3, 0x52 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -20095,7 +20095,7 @@ sub_8084894: @ 8084894 strh r3, [r0, 0x34] strh r1, [r0, 0x3C] adds r1, r2, 0 - bl StartObjectImageAnim + bl StartSpriteAnim pop {r4} pop {r0} bx r0 @@ -22095,13 +22095,13 @@ FieldEffectScript_LoadTiles: @ 808578C bl FieldEffectScript_ReadWord adds r5, r0, 0 ldrh r0, [r5, 0x6] - bl GetObjectTileRangeStartByTag + bl GetSpriteTileStartByTag lsls r0, 16 ldr r1, _080857B8 cmp r0, r1 bne _080857AA adds r0, r5, 0 - bl LoadObjectPic + bl LoadSpriteSheet _080857AA: ldr r0, [r4] adds r0, 0x4 @@ -22119,9 +22119,9 @@ FieldEffectScript_LoadFadedPalette: @ 80857BC adds r5, r0, 0 bl FieldEffectScript_ReadWord adds r4, r0, 0 - bl LoadTaggedObjectPalette + bl LoadSpritePalette ldrh r0, [r4, 0x4] - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 24 bl sub_807D78C @@ -22138,7 +22138,7 @@ FieldEffectScript_LoadPalette: @ 80857E4 push {r4,lr} adds r4, r0, 0 bl FieldEffectScript_ReadWord - bl LoadTaggedObjectPalette + bl LoadSpritePalette ldr r0, [r4] adds r0, 0x4 str r0, [r4] @@ -22171,7 +22171,7 @@ FieldEffectFreeGraphicsResources: @ 8085818 ldrh r5, [r1] ldrb r4, [r0, 0x5] lsrs r4, 4 - bl RemoveObjectAndFreeTiles + bl DestroySprite adds r0, r5, 0 bl FieldEffectFreeTilesIfUnused adds r0, r4, 0 @@ -22200,7 +22200,7 @@ FieldEffectFreeTilesIfUnused: @ 8085854 lsls r0, 16 lsrs r4, r0, 16 adds r0, r4, 0 - bl GetTagByObjectTileRangeStart + bl GetSpriteTileTagByTileStart lsls r0, 16 lsrs r3, r0, 16 ldr r0, _080858B0 @@ -22237,7 +22237,7 @@ _08085898: cmp r2, 0x3F bls _0808586E adds r0, r3, 0 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag _080858A8: pop {r4,r5} pop {r0} @@ -22253,7 +22253,7 @@ FieldEffectFreePaletteIfUnused: @ 80858B8 lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 - bl gpu_pal_tag_by_index + bl GetSpritePaletteTagByPaletteNum lsls r0, 16 lsrs r5, r0, 16 ldr r0, _08085908 @@ -22284,7 +22284,7 @@ _080858F0: cmp r2, 0x3F bls _080858D4 adds r0, r5, 0 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag _08085900: pop {r4-r6} pop {r0} @@ -22460,7 +22460,7 @@ sub_80859BC: @ 80859BC adds r1, r5, 0 adds r2, r6, 0 mov r3, r9 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 add sp, 0x18 @@ -22474,9 +22474,9 @@ sub_80859BC: @ 80859BC _08085A44: .4byte gTrainerFrontPicPaletteTable _08085A48: .4byte gTrainerFrontPicTable _08085A4C: .4byte gUnknown_0839F0F4 -_08085A50: .4byte gDummyObjectImageAnimTable -_08085A54: .4byte gDummyObjectRotScalAnimTable -_08085A58: .4byte nullsub_2 +_08085A50: .4byte gDummySpriteAnimTable +_08085A54: .4byte gDummySpriteAffineAnimTable +_08085A58: .4byte SpriteCallbackDummy thumb_func_end sub_80859BC thumb_func_start sub_8085A5C @@ -22520,7 +22520,7 @@ AddNewGameBirchObject: @ 8085A94 lsls r6, 24 lsrs r6, 24 ldr r0, _08085ACC - bl LoadTaggedObjectPalette + bl LoadSpritePalette ldr r0, _08085AD0 lsls r4, 16 asrs r4, 16 @@ -22529,7 +22529,7 @@ AddNewGameBirchObject: @ 8085A94 adds r1, r4, 0 adds r2, r5, 0 adds r3, r6, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 pop {r4-r6} @@ -22589,7 +22589,7 @@ sub_8085AD4: @ 8085AD4 ldrh r0, [r5, 0x4] strh r0, [r4, 0x2] ldrh r0, [r5, 0x4] - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag adds r0, 0x10 lsls r0, 24 lsrs r0, 24 @@ -22604,7 +22604,7 @@ sub_8085AD4: @ 8085AD4 adds r1, r6, 0 mov r2, r8 mov r3, r10 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 add sp, 0x8 @@ -22678,7 +22678,7 @@ sub_8085B88: @ 8085B88 ldrh r0, [r4, 0x4] strh r0, [r5, 0x2] ldrh r0, [r4, 0x4] - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag adds r0, 0x10 lsls r0, 24 lsrs r0, 24 @@ -22693,7 +22693,7 @@ sub_8085B88: @ 8085B88 adds r1, r6, 0 mov r2, r8 mov r3, r9 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 add sp, 0xC @@ -22718,10 +22718,10 @@ sub_8085C44: @ 8085C44 bl sub_807DE68 ldrb r0, [r4, 0x5] lsrs r0, 4 - bl gpu_pal_tag_by_index + bl GetSpritePaletteTagByPaletteNum lsls r0, 16 lsrs r0, 16 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag ldrb r0, [r4, 0x1] lsls r0, 30 cmp r0, 0 @@ -22729,10 +22729,10 @@ sub_8085C44: @ 8085C44 ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix _08085C6E: adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite pop {r4} pop {r0} bx r0 @@ -23038,7 +23038,7 @@ sub_8085E94: @ 8085E94 cmp r0, 0x6 ble _08085EC6 adds r0, r1, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r0, 0x19 bl FieldEffectActiveListRemove ldr r0, _08085ED0 @@ -23233,7 +23233,7 @@ sub_808600C: @ 808600C cmp r0, 0x6 ble _0808603E adds r0, r1, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r0, 0x3E bl FieldEffectActiveListRemove ldr r0, _08086048 @@ -23268,7 +23268,7 @@ sub_808604C: @ 808604C lsls r6, 16 lsrs r6, 16 ldr r0, _08086098 - bl obj_add_empty_with_callback + bl CreateInvisibleSprite lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -23342,7 +23342,7 @@ _080860D4: lsls r2, 16 asrs r2, 16 movs r3, 0 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 ldr r2, _08086150 @@ -23453,7 +23453,7 @@ _080861B8: ldr r3, _080862B0 mov r10, r3 mov r0, r10 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 4 movs r1, 0x84 @@ -23476,7 +23476,7 @@ _080861B8: mov r0, r8 ands r4, r0 mov r0, r10 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 4 movs r1, 0x83 @@ -23495,7 +23495,7 @@ _080861B8: mov r3, r8 ands r4, r3 mov r0, r10 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 4 movs r1, 0x81 @@ -23513,7 +23513,7 @@ _080861B8: lsls r4, 24 lsrs r4, 24 mov r0, r10 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 4 ldr r3, _080862C0 @@ -23530,7 +23530,7 @@ _080861B8: adds r3, r4, 0 bl sub_8085C7C mov r0, r10 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 4 ldr r1, _080862C4 @@ -23600,7 +23600,7 @@ _080862F8: lsrs r4, 24 ldr r0, _080863A4 mov r8, r0 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 4 movs r1, 0x84 @@ -23621,7 +23621,7 @@ _080862F8: adds r3, r4, 0 bl sub_8085C7C mov r0, r8 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 4 movs r1, 0x83 @@ -23633,7 +23633,7 @@ _080862F8: adds r3, r4, 0 bl sub_8085C7C mov r0, r8 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 4 movs r1, 0x81 @@ -23645,7 +23645,7 @@ _080862F8: adds r3, r4, 0 bl sub_8085C7C mov r0, r8 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 4 ldr r1, _080863B4 @@ -23656,7 +23656,7 @@ _080862F8: adds r3, r4, 0 bl sub_8085C7C mov r0, r8 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 4 ldr r1, _080863B8 @@ -23769,7 +23769,7 @@ sub_8086430: @ 8086430 asrs r2, 16 adds r1, r3, 0 movs r3, 0 - bl AddObjectToBack + bl CreateSpriteAtEnd adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -23792,7 +23792,7 @@ sub_8086430: @ 8086430 orrs r1, r2 strb r1, [r3] ldr r1, _08086488 - bl SetSpriteOamTables_NoPriorityFromTable + bl SetSubspriteTables adds r0, r4, 0 pop {r4} pop {r1} @@ -23821,7 +23821,7 @@ sub_808648C: @ 808648C strb r0, [r2] adds r0, r4, 0 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim _080864B0: adds r0, r4, 0 adds r0, 0x3F @@ -23856,7 +23856,7 @@ sub_80864CC: @ 80864CC lsls r2, 16 asrs r2, 16 movs r3, 0 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r4, r0, 24 lsls r0, r4, 4 @@ -23865,7 +23865,7 @@ sub_80864CC: @ 80864CC ldr r1, _0808650C adds r0, r1 ldr r1, _08086510 - bl SetSpriteOamTables_NoPriorityFromTable + bl SetSubspriteTables b _08086528 .align 2, 0 _08086508: .4byte gUnknown_0839F238 @@ -23878,7 +23878,7 @@ _08086514: lsls r2, 16 asrs r2, 16 movs r3, 0 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r4, r0, 24 _08086528: @@ -26083,7 +26083,7 @@ sub_80875D4: @ 80875D4 movs r3, 0x4 ldrsh r2, [r4, r3] ldrb r3, [r4, 0x8] - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 ldr r1, _08087634 @@ -26387,7 +26387,7 @@ sub_8087828: @ 8087828 movs r3, 0x4 ldrsh r2, [r4, r3] ldrb r3, [r4, 0x8] - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 ldr r1, _08087888 @@ -28460,7 +28460,7 @@ sub_8088830: @ 8088830 .align 2, 0 _08088884: .4byte 0x7fffffff _08088888: .4byte 0x02020004 -_0808888C: .4byte nullsub_2 +_0808888C: .4byte SpriteCallbackDummy thumb_func_end sub_8088830 thumb_func_start sub_8088890 @@ -28834,7 +28834,7 @@ sub_8088B68: @ 8088B68 movs r1, 0x78 movs r2, 0 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -29215,7 +29215,7 @@ sub_8088E2C: @ 8088E2C ldr r6, _08088EB0 adds r0, r6 movs r1, 0x16 - bl StartObjectImageAnim + bl StartSpriteAnim ldrb r0, [r4, 0x1] movs r1, 0x10 orrs r0, r1 @@ -29233,7 +29233,7 @@ sub_8088E2C: @ 8088E2C adds r0, r1 lsls r0, 2 adds r0, r6 - bl RemoveObjectAndFreeTiles + bl DestroySprite _08088E98: ldrh r0, [r5, 0x8] adds r0, 0x1 @@ -29347,7 +29347,7 @@ sub_8088F60: @ 8088F60 movs r1, 0xFF movs r2, 0xB4 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r2, r0, 4 @@ -29459,10 +29459,10 @@ sub_8089018: @ 8089018 ldr r0, _080890CC str r0, [r4, 0x10] adds r0, r4, 0 - bl obj_alloc_rotscale_entry + bl InitSpriteAffineAnim adds r0, r4, 0 movs r1, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim movs r0, 0x76 strh r0, [r4, 0x20] ldr r0, _080890D0 @@ -29516,14 +29516,14 @@ _08089092: ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix ldrb r1, [r4, 0x1] lsrs r1, 6 ldrb r2, [r4, 0x3] lsrs r2, 6 adds r0, r4, 0 movs r3, 0 - bl CalcVecFromObjectCenterToObjectUpperLeft + bl CalcCenterToCornerVec _080890C4: pop {r4} pop {r0} @@ -29615,10 +29615,10 @@ sub_808914C: @ 808914C ldr r0, _08089228 str r0, [r4, 0x10] adds r0, r4, 0 - bl obj_alloc_rotscale_entry + bl InitSpriteAffineAnim adds r0, r4, 0 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim movs r0, 0x5E strh r0, [r4, 0x20] ldr r0, _0808922C @@ -29696,7 +29696,7 @@ _080891F2: ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] @@ -29833,7 +29833,7 @@ _080892F2: ldr r1, _08089350 adds r0, r1 movs r1, 0x16 - bl StartObjectImageAnim + bl StartSpriteAnim ldrb r1, [r4, 0x1] movs r0, 0x21 negs r0, r0 @@ -30059,7 +30059,7 @@ sub_80894C4: @ 80894C4 lsls r0, 2 ldr r1, _080894F8 adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -34201,8 +34201,8 @@ _0808B60C: .4byte 0x03005cf0 sub_808B610: @ 808B610 push {lr} bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r0} bx r0 @@ -34211,8 +34211,8 @@ sub_808B610: @ 808B610 thumb_func_start sub_808B628 sub_808B628: @ 808B628 push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -34352,7 +34352,7 @@ _0808B758: bl sub_8073B94 bl remove_some_task bl ResetTasks - bl ResetAllObjectData + bl ResetSpriteData b _0808B95C _0808B76A: ldr r0, _0808B778 @@ -35551,8 +35551,8 @@ _0808C0B4: .4byte 0x0202ffba thumb_func_start sub_808C0B8 sub_808C0B8: @ 808C0B8 push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -35870,9 +35870,9 @@ _0808C340: .4byte 0x81000800 _0808C344: bl remove_some_task bl ResetTasks - bl ResetAllObjectData + bl ResetSpriteData bl sub_8073B94 - bl ResetObjectPaletteAllocator + bl FreeAllSpritePalettes ldr r1, _0808C374 movs r0, 0x8 strb r0, [r1] @@ -36161,8 +36161,8 @@ _0808C5EC: .4byte 0x03004b20 sub_808C5F0: @ 808C5F0 push {lr} bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r0} bx r0 @@ -37909,15 +37909,15 @@ _0808D490: .4byte 0x0000064c _0808D494: .4byte 0x03001770 _0808D498: .4byte 0x0000043c _0808D49C: - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes ldr r1, _0808D4C4 movs r0, 0x8 strb r0, [r1] ldr r0, _0808D4C8 bl LoadCompressedObjectPic ldr r0, _0808D4CC - bl LoadTaggedObjectPalettes + bl LoadSpritePalettes adds r0, r5, 0 bl sub_808E978 ldr r1, _0808D4D0 @@ -40382,7 +40382,7 @@ _0808E834: lsls r0, 2 ldr r1, _0808E884 adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r1, [r6] ldr r0, _0808E880 adds r1, r0 @@ -40550,7 +40550,7 @@ sub_808E978: @ 808E978 movs r1, 0xB8 movs r2, 0x4 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r7, r0, 24 ldr r1, _0808EB40 @@ -40565,7 +40565,7 @@ sub_808E978: @ 808E978 movs r1, 0xB8 movs r2, 0x9C movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r7, r0, 24 lsls r0, r7, 4 @@ -40583,18 +40583,18 @@ sub_808E978: @ 808E978 movs r1, 0xEA movs r2, 0x14 movs r3, 0 - bl AddObjectToFront + bl CreateSprite ldr r5, _0808EB48 adds r0, r5, 0 movs r1, 0x10 movs r2, 0x8A movs r3, 0 - bl AddObjectToFront + bl CreateSprite adds r0, r5, 0 movs r1, 0x30 movs r2, 0x8A movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r7, r0, 24 lsls r0, r7, 4 @@ -40602,12 +40602,12 @@ sub_808E978: @ 808E978 lsls r0, 2 add r0, r10 movs r1, 0x3 - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r5, 0 movs r1, 0x10 movs r2, 0x9E movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r7, r0, 24 lsls r4, r7, 4 @@ -40616,7 +40616,7 @@ sub_808E978: @ 808E978 add r4, r10 adds r0, r4, 0 movs r1, 0x2 - bl StartObjectImageAnim + bl StartSpriteAnim movs r0, 0x80 mov r9, r0 mov r1, r9 @@ -40625,7 +40625,7 @@ sub_808E978: @ 808E978 movs r1, 0x30 movs r2, 0x9E movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r7, r0, 24 lsls r0, r7, 4 @@ -40633,13 +40633,13 @@ sub_808E978: @ 808E978 lsls r0, 2 add r0, r10 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r6, _0808EB4C adds r0, r6, 0 movs r1, 0 movs r2, 0x50 movs r3, 0x2 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r7, r0, 24 lsls r1, r7, 4 @@ -40669,7 +40669,7 @@ sub_808E978: @ 808E978 movs r1, 0 movs r2, 0x50 movs r3, 0x2 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r7, r0, 24 lsls r1, r7, 4 @@ -40698,12 +40698,12 @@ _0808EAC8: movs r1, 0x20 movs r2, 0x28 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite adds r0, r4, 0 movs r1, 0x20 movs r2, 0x48 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r7, r0, 24 lsls r0, r7, 4 @@ -40711,14 +40711,14 @@ _0808EAC8: lsls r0, 2 add r0, r10 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim movs r0, 0 mov r8, r0 ldr r0, _0808EB54 movs r1, 0x1C movs r2, 0x30 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r7, r0, 24 ldr r0, _0808EB58 @@ -40738,7 +40738,7 @@ _0808EAC8: lsls r1, r5, 24 lsrs r1, 24 adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim cmp r5, 0 beq _0808EB60 movs r0, 0x1 @@ -40766,7 +40766,7 @@ _0808EB6C: movs r1, 0x22 movs r2, 0x30 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r7, r0, 24 ldr r0, _0808EBBC @@ -40795,7 +40795,7 @@ _0808EBA4: adds r0, r1 lsls r1, r5, 24 lsrs r1, 24 - bl StartObjectImageAnim + bl StartSpriteAnim b _0808EBDC .align 2, 0 _0808EBB8: .4byte gUnknown_083A059C @@ -40819,7 +40819,7 @@ _0808EBDC: movs r1, 0x28 movs r2, 0x30 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r7, r0, 24 ldr r5, _0808EC68 @@ -40841,14 +40841,14 @@ _0808EBDC: adds r0, r4 lsls r1, 24 lsrs r1, 24 - bl StartObjectImageAnim + bl StartSpriteAnim movs r0, 0 mov r8, r0 adds r0, r6, 0 movs r1, 0x1C movs r2, 0x50 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r7, r0, 24 ldr r0, [r5] @@ -40866,7 +40866,7 @@ _0808EBDC: lsls r1, r5, 24 lsrs r1, 24 adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim cmp r5, 0 beq _0808EC74 movs r0, 0x1 @@ -40890,7 +40890,7 @@ _0808EC80: movs r1, 0x22 movs r2, 0x50 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r7, r0, 24 ldr r0, _0808ECD0 @@ -40919,7 +40919,7 @@ _0808ECB8: adds r0, r1 lsls r1, r5, 24 lsrs r1, 24 - bl StartObjectImageAnim + bl StartSpriteAnim b _0808ECF0 .align 2, 0 _0808ECCC: .4byte gUnknown_083A059C @@ -40942,7 +40942,7 @@ _0808ECF0: movs r1, 0x28 movs r2, 0x50 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r7, r0, 24 ldr r0, _0808ED50 @@ -40964,12 +40964,12 @@ _0808ECF0: adds r0, r4 lsls r1, 24 lsrs r1, 24 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r0, _0808ED58 movs r1, 0x8C movs r2, 0x60 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r7, r0, 24 lsls r0, r7, 4 @@ -40988,7 +40988,7 @@ _0808ED5C: movs r1, 0x8C movs r2, 0x50 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r7, r0, 24 lsls r0, r7, 4 @@ -41029,7 +41029,7 @@ sub_808ED94: @ 808ED94 cmp r0, 0 beq _0808EDAC adds r0, r1, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _0808EDAC: pop {r0} bx r0 @@ -41121,7 +41121,7 @@ sub_808EE28: @ 808EE28 cmp r0, 0x3 beq _0808EE58 adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r0, [r5] b _0808EF16 .align 2, 0 @@ -41170,7 +41170,7 @@ _0808EE94: str r2, [sp] movs r2, 0 movs r3, 0 - bl SetSpriteTransformationMatrix + bl SetOamMatrix adds r1, r6, 0x1 movs r0, 0x1F ands r1, r0 @@ -41219,7 +41219,7 @@ _0808EEF8: cmp r0, 0 beq _0808EF22 adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r0, _0808EF2C ldr r0, [r0] _0808EF16: @@ -41254,7 +41254,7 @@ sub_808EF38: @ 808EF38 cmp r0, 0x3 beq _0808EF60 adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite b _0808EF7C .align 2, 0 _0808EF58: .4byte 0x0202ffb4 @@ -41297,7 +41297,7 @@ sub_808EF8C: @ 808EF8C cmp r0, 0x3 beq _0808EFB4 adds r0, r3, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite b _0808F084 .align 2, 0 _0808EFAC: .4byte 0x0202ffb4 @@ -41434,7 +41434,7 @@ sub_808F08C: @ 808F08C cmp r0, 0x3 beq _0808F0A8 adds r0, r1, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _0808F0A8: pop {r0} bx r0 @@ -41459,7 +41459,7 @@ sub_808F0B4: @ 808F0B4 cmp r0, 0x3 beq _0808F0E0 adds r0, r6, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite b _0808F158 .align 2, 0 _0808F0D8: .4byte 0x0202ffb4 @@ -41489,7 +41489,7 @@ _0808F0E0: negs r3, r3 lsrs r3, 16 str r1, [sp] - bl SetSpriteTransformationMatrix + bl SetOamMatrix ldr r1, [r7] adds r1, r5 ldrh r0, [r6, 0x30] @@ -41550,7 +41550,7 @@ sub_808F168: @ 808F168 cmp r2, 0x3 beq _0808F190 adds r0, r3, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite b _0808F208 .align 2, 0 _0808F188: .4byte 0x0202ffb4 @@ -43516,7 +43516,7 @@ _080901D4: movs r0, 0x1 movs r2, 0 movs r3, 0 - bl SetSpriteTransformationMatrix + bl SetOamMatrix ldr r0, _0809026C ldrb r1, [r4, 0x5] lsrs r1, 4 @@ -43589,7 +43589,7 @@ _08090278: movs r0, 0x2 movs r2, 0 movs r3, 0 - bl SetSpriteTransformationMatrix + bl SetOamMatrix ldr r0, _0809030C ldrb r1, [r4, 0x5] lsrs r1, 4 @@ -45380,8 +45380,8 @@ _08091100: ldr r0, _0809114C ands r0, r1 strh r0, [r2] - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes ldr r1, _08091150 movs r0, 0x8 strb r0, [r1] @@ -46538,7 +46538,7 @@ _080919CE: lsls r2, r3, 16 asrs r2, 16 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r1, _08091A48 @@ -46620,7 +46620,7 @@ sub_8091A4C: @ 8091A4C adds r1, r6, 0 mov r2, r8 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r1, _08091AF4 @@ -47222,7 +47222,7 @@ _08091F50: ldr r0, _08091FAC bl LoadCompressedObjectPic ldr r0, _08091FB0 - bl LoadTaggedObjectPalettes + bl LoadSpritePalettes adds r0, r5, 0 bl sub_809308C movs r4, 0 @@ -49383,7 +49383,7 @@ sub_809308C: @ 809308C movs r1, 0xB8 movs r2, 0x4 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r4, _08093108 @@ -49405,7 +49405,7 @@ sub_809308C: @ 809308C movs r1, 0xB8 movs r2, 0x6C movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -49577,8 +49577,8 @@ _08093238: .4byte sub_809323C sub_809323C: @ 809323C push {lr} bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r0} bx r0 @@ -49587,8 +49587,8 @@ sub_809323C: @ 809323C thumb_func_start sub_8093254 sub_8093254: @ 8093254 push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram ldr r2, _0809329C ldrb r0, [r2, 0x6] @@ -50291,8 +50291,8 @@ _080937A0: .4byte 0x0000080e sub_80937A4: @ 80937A4 push {lr} bl sub_8073B94 - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes bl ResetTasks pop {r0} bx r0 @@ -55897,9 +55897,9 @@ sub_8096264: @ 8096264 movs r2, 0x8 bl memset adds r0, r5, 0 - bl LoadTaggedObjectPalette + bl LoadSpritePalette mov r0, sp - bl LoadObjectPics + bl LoadSpriteSheets ldr r0, _08096304 mov r1, r8 str r1, [r0] @@ -55940,20 +55940,20 @@ sub_8096310: @ 8096310 ldr r1, _08096348 adds r0, r1 ldrh r0, [r0] - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag ldr r0, [r4] movs r5, 0x90 lsls r5, 2 adds r0, r5 ldrh r0, [r0] - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag ldr r0, [r4] adds r0, r5 ldrh r0, [r0] adds r0, 0x1 lsls r0, 16 lsrs r0, 16 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag pop {r4,r5} pop {r0} bx r0 @@ -56097,7 +56097,7 @@ sub_80963D0: @ 80963D0 movs r1, 0xA0 movs r2, 0x60 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r1, r0, 24 ldr r3, [r6] @@ -56135,7 +56135,7 @@ _08096488: add r0, sp, 0x4 movs r1, 0x7C movs r2, 0x50 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r1, r0, 24 ldr r2, [r6] @@ -56182,7 +56182,7 @@ _080964E6: ldr r0, [r0] lsls r1, r5, 24 lsrs r1, 24 - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -56240,9 +56240,9 @@ _0809654C: bx r0 .align 2, 0 _08096564: .4byte 0xffff0fff -_08096568: .4byte gDummyObjectImageAnimTable -_0809656C: .4byte gDummyObjectRotScalAnimTable -_08096570: .4byte nullsub_2 +_08096568: .4byte gDummySpriteAnimTable +_0809656C: .4byte gDummySpriteAffineAnimTable +_08096570: .4byte SpriteCallbackDummy _08096574: .4byte 0x02038478 _08096578: .4byte 0x00000242 _0809657C: .4byte 0x02020004 @@ -56259,7 +56259,7 @@ sub_809658C: @ 809658C ldr r0, [r0] cmp r0, 0 beq _080965A2 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r1, [r4] movs r0, 0 str r0, [r1] @@ -56274,7 +56274,7 @@ _080965A6: ldr r0, [r0] cmp r0, 0 beq _080965C2 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r0, [r6] adds r0, 0x4 adds r0, r4 @@ -56296,7 +56296,7 @@ _080965CE: ldr r0, [r0] cmp r0, 0 beq _080965E2 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080965E2: adds r0, r5, 0x1 lsls r0, 16 @@ -56460,7 +56460,7 @@ sub_80966F4: @ 80966F4 lsls r1, 2 adds r0, r1 ldrh r0, [r0] - bl GetObjectTileRangeStartByTag + bl GetSpriteTileStartByTag adds r6, r0, 0 lsls r6, 16 lsrs r6, 11 @@ -56586,9 +56586,9 @@ _08096800: .4byte 0x04000010 sub_8096804: @ 8096804 push {lr} bl sub_8073B94 - bl ResetAllObjectData - bl FreeAllObjectTiles - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpriteTiles + bl FreeAllSpritePalettes bl ResetTasks ldr r1, _0809683C movs r2, 0xA0 @@ -56930,8 +56930,8 @@ sub_8096AFC: @ 8096AFC adds r2, 0x2 ldrh r0, [r1, 0x8] strh r0, [r2] - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl sub_809CFF0 bl copy_pal_bg_faded_to_pal_ram pop {r0} @@ -56950,8 +56950,8 @@ sub_8096B38: @ 8096B38 bl _call_via_r0 bl sub_8097E44 bl sub_8098734 - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer pop {r0} bx r0 .align 2, 0 @@ -59297,7 +59297,7 @@ sub_8097E70: @ 8097E70 movs r2, 0x2 bl gpu_pal_apply ldr r0, _08097F54 - bl LoadTaggedObjectPalette + bl LoadSpritePalette bl sub_80980D4 bl sub_8097F58 bl sub_8097FB8 @@ -59347,7 +59347,7 @@ sub_8097F58: @ 8097F58 movs r0, 0x95 strh r0, [r1, 0x22] movs r0, 0xD - bl GetObjectTileRangeStartByTag + bl GetSpriteTileStartByTag ldr r1, _08097FB0 adds r4, r1 lsls r0, 16 @@ -59376,7 +59376,7 @@ sub_8097FB8: @ 8097FB8 str r0, [sp] str r1, [sp, 0x4] mov r0, sp - bl LoadObjectPic + bl LoadSpriteSheet movs r4, 0 ldr r5, _08098010 _08097FD0: @@ -59388,7 +59388,7 @@ _08097FD0: ldr r0, _08098014 movs r2, 0x9 movs r3, 0x2 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r2, r4, 2 @@ -59511,7 +59511,7 @@ _080980C8: bx r0 .align 2, 0 _080980CC: .4byte 0x0400004c -_080980D0: .4byte nullsub_2 +_080980D0: .4byte SpriteCallbackDummy thumb_func_end sub_8098090 thumb_func_start sub_80980D4 @@ -59566,13 +59566,13 @@ _08098116: movs r1, 0 str r1, [r0] adds r0, r5, 0 - bl LoadObjectPic + bl LoadSpriteSheet lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0 beq _080981C4 add r0, sp, 0x20 - bl LoadTaggedObjectPalette + bl LoadSpritePalette lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xFF @@ -59622,7 +59622,7 @@ _080981B0: movs r1, 0x28 movs r2, 0x30 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -59636,9 +59636,9 @@ _080981C4: cmp r0, 0 bne _080981DE movs r0, 0x2 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag ldr r0, _080981EC - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag _080981DE: add sp, 0x28 pop {r4,r5} @@ -59845,7 +59845,7 @@ _08098382: adds r1, 0x1 lsls r1, 24 lsrs r1, 24 - bl StartObjectImageAnimIfDifferent + bl StartSpriteAnimIfDifferent adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -59880,7 +59880,7 @@ _080983D4: ldr r0, [r0] lsls r1, r4, 25 lsrs r1, 24 - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -61204,7 +61204,7 @@ _08098E56: .align 2, 0 _08098E5C: .4byte gUnknown_083B6DB4 _08098E60: .4byte 0x00001178 -_08098E64: .4byte nullsub_2 +_08098E64: .4byte SpriteCallbackDummy thumb_func_end sub_8098E24 thumb_func_start sub_8098E68 @@ -61238,7 +61238,7 @@ _08098E98: pop {r0} bx r0 .align 2, 0 -_08098E9C: .4byte nullsub_2 +_08098E9C: .4byte SpriteCallbackDummy thumb_func_end sub_8098E68 thumb_func_start sub_8098EA0 @@ -62003,7 +62003,7 @@ _08099468: pop {r0} bx r0 .align 2, 0 -_08099470: .4byte nullsub_2 +_08099470: .4byte SpriteCallbackDummy _08099474: .4byte gUnknown_083B6DB4 _08099478: .4byte 0x00001038 _0809947C: .4byte 0x00001171 @@ -62300,7 +62300,7 @@ _0809968A: _080996A0: .4byte gUnknown_083B6DB4 _080996A4: .4byte 0x00001050 _080996A8: .4byte 0x00001034 -_080996AC: .4byte nullsub_2 +_080996AC: .4byte SpriteCallbackDummy thumb_func_end sub_809960C thumb_func_start sub_80996B0 @@ -62352,7 +62352,7 @@ _08099704: .4byte gUnknown_083B6DB4 _08099708: .4byte 0x000010c8 _0809970C: .4byte 0x00001050 _08099710: .4byte 0x00001034 -_08099714: .4byte nullsub_2 +_08099714: .4byte SpriteCallbackDummy _08099718: .4byte 0x00001170 thumb_func_end sub_80996B0 @@ -62486,7 +62486,7 @@ _08099808: .4byte 0x000010c8 _0809980C: .4byte 0x00001034 _08099810: .4byte gUnknown_08208344 _08099814: .4byte sub_80999C4 -_08099818: .4byte nullsub_2 +_08099818: .4byte SpriteCallbackDummy thumb_func_end sub_809971C thumb_func_start sub_809981C @@ -62553,7 +62553,7 @@ _0809988A: ldr r0, [r0] cmp r0, 0 beq _080998C0 - bl obj_alloc_rotscale_entry + bl InitSpriteAffineAnim ldr r0, [r4] ldr r2, [r0] ldrb r1, [r2, 0x1] @@ -62570,7 +62570,7 @@ _0809988A: ldr r0, [r4] ldr r0, [r0] movs r1, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim _080998C0: pop {r4} pop {r0} @@ -62638,7 +62638,7 @@ sub_8099920: @ 8099920 ldrb r0, [r0, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix ldr r0, [r4] ldr r0, [r0] bl sub_8099BE0 @@ -62675,7 +62675,7 @@ sub_8099958: @ 8099958 ldr r0, [r3] ldr r0, [r0] movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim _08099982: pop {r0} bx r0 @@ -62940,7 +62940,7 @@ sub_8099AFC: @ 8099AFC asrs r2, 16 mov r0, sp mov r3, r9 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 @@ -63000,7 +63000,7 @@ sub_8099BE0: @ 8099BE0 ldrh r0, [r4, 0x2E] bl sub_8099AAC adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite pop {r4} pop {r0} bx r0 @@ -63875,14 +63875,14 @@ sub_809A23C: @ 809A23C adds r0, r5, r2 strh r1, [r0] mov r0, sp - bl LoadTaggedObjectPalettes + bl LoadSpritePalettes ldr r3, _0809A3B0 adds r6, r5, r3 movs r0, 0xFC lsls r0, 2 str r0, [r6] adds r0, r4, 0 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -63901,7 +63901,7 @@ sub_809A23C: @ 809A23C orrs r0, r1 str r0, [r6] ldr r0, _0809A3B8 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -63923,7 +63923,7 @@ sub_809A23C: @ 809A23C adds r1, r4, 0 bl sub_809A1BC ldr r0, [sp, 0x20] - bl LoadObjectPic + bl LoadSpriteSheet adds r0, r4, 0 bl sub_8072CA4 lsls r0, 24 @@ -63940,7 +63940,7 @@ _0809A328: ldr r0, _0809A3C4 movs r2, 0x1C movs r3, 0x17 - bl AddObjectToFront + bl CreateSprite adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -63959,7 +63959,7 @@ _0809A328: str r0, [r2] lsls r1, r4, 24 lsrs r1, 24 - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -64092,7 +64092,7 @@ _0809A478: adds r1, r5, 0 bl sub_809A1BC adds r0, r6, 0 - bl LoadObjectPic + bl LoadSpriteSheet adds r4, 0x7E ldr r3, [sp, 0x28] adds r4, r3, r4 @@ -64139,7 +64139,7 @@ _0809A4DE: mov r0, sp movs r2, 0x1C movs r3, 0x17 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r1, _0809A584 @@ -64173,7 +64173,7 @@ _0809A4DE: str r1, [r0, 0x1C] lsls r1, r7, 24 lsrs r1, 24 - bl StartObjectImageAnim + bl StartSpriteAnim movs r3, 0xCF lsls r3, 4 adds r4, r3 @@ -64223,14 +64223,14 @@ sub_809A598: @ 809A598 cmp r0, 0 bne _0809A5B8 movs r0, 0x4 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag b _0809A5BE .align 2, 0 _0809A5B0: .4byte gUnknown_083B6DB4 _0809A5B4: .4byte 0x00000cca _0809A5B8: movs r0, 0x3 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag _0809A5BE: ldr r0, _0809A5E0 ldr r0, [r0] @@ -64283,7 +64283,7 @@ _0809A614: pop {r0} bx r0 .align 2, 0 -_0809A618: .4byte nullsub_2 +_0809A618: .4byte SpriteCallbackDummy thumb_func_end sub_809A5E8 thumb_func_start sub_809A61C @@ -64312,7 +64312,7 @@ _0809A630: cmp r0, 0xC0 bls _0809A64E adds r0, r2, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _0809A64E: pop {r0} bx r0 @@ -64390,9 +64390,9 @@ sub_809A6D0: @ 809A6D0 sub_809A6DC: @ 809A6DC push {r4,r5,lr} ldr r0, _0809A760 - bl LoadObjectPic + bl LoadSpriteSheet ldr r0, _0809A764 - bl LoadTaggedObjectPalette + bl LoadSpritePalette movs r5, 0 _0809A6EC: lsls r1, r5, 4 @@ -64405,7 +64405,7 @@ _0809A6EC: ldr r0, _0809A768 movs r2, 0x1C movs r3, 0x15 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -64418,7 +64418,7 @@ _0809A6EC: lsls r1, r5, 24 lsrs r1, 24 adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim movs r0, 0x1 cmp r5, 0 bne _0809A72C @@ -64781,7 +64781,7 @@ sub_809A9A0: @ 809A9A0 adds r1, r5, 0 adds r2, r6, 0 adds r3, r4, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -64794,7 +64794,7 @@ sub_809A9A0: @ 809A9A0 ldr r5, _0809AA10 adds r6, r4, r5 adds r0, r6, 0 - bl StartObjectImageAnim + bl StartSpriteAnim movs r0, 0x3 mov r1, r8 ands r1, r0 @@ -64814,7 +64814,7 @@ sub_809A9A0: @ 809A9A0 .align 2, 0 _0809AA0C: .4byte gUnknown_083BB2F0 _0809AA10: .4byte 0x02020004 -_0809AA14: .4byte nullsub_2 +_0809AA14: .4byte SpriteCallbackDummy _0809AA18: movs r0, 0 _0809AA1A: @@ -65483,7 +65483,7 @@ sub_809AF18: @ 809AF18 adds r0, r1 ldr r0, [r0] movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim _0809AF46: cmp r4, 0x1 bne _0809AF70 @@ -65567,7 +65567,7 @@ sub_809AFB8: @ 809AFB8 adds r0, r4, r1 ldr r0, [r0] movs r1, 0 - bl StartObjectImageAnim + bl StartSpriteAnim _0809AFEA: bl sub_809BF74 movs r0, 0 @@ -65802,7 +65802,7 @@ _0809B190: adds r0, r5, r1 ldr r0, [r0] movs r1, 0x2 - bl StartObjectImageAnim + bl StartSpriteAnim b _0809B1C8 _0809B1A0: bl sub_809B324 @@ -65814,7 +65814,7 @@ _0809B1A0: adds r0, r5, r1 ldr r0, [r0] movs r1, 0x3 - bl StartObjectImageAnim + bl StartSpriteAnim bl sub_809B384 b _0809B1C8 _0809B1BE: @@ -65866,7 +65866,7 @@ _0809B202: adds r0, r4, r1 ldr r0, [r0] movs r1, 0x2 - bl StartObjectImageAnim + bl StartSpriteAnim bl sub_809B3E0 b _0809B238 _0809B220: @@ -65879,7 +65879,7 @@ _0809B220: adds r0, r4, r1 ldr r0, [r0] movs r1, 0 - bl StartObjectImageAnim + bl StartSpriteAnim _0809B238: ldrb r0, [r5] adds r0, 0x1 @@ -65947,7 +65947,7 @@ _0809B2A0: adds r0, r4, r1 ldr r0, [r0] movs r1, 0x2 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r2, _0809B2D0 adds r0, r4, r2 ldrb r0, [r0] @@ -65975,7 +65975,7 @@ _0809B2E0: adds r0, r4, r1 ldr r0, [r0] movs r1, 0x3 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r2, _0809B310 adds r0, r4, r2 ldrb r0, [r0] @@ -66447,7 +66447,7 @@ _0809B698: adds r0, r1 ldr r0, [r0] movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim movs r0, 0x1 _0809B6AC: pop {r4-r6} @@ -66468,7 +66468,7 @@ sub_809B6BC: @ 809B6BC adds r0, r1 ldr r0, [r0] movs r1, 0 - bl StartObjectImageAnim + bl StartSpriteAnim bl sub_809BF74 pop {r0} bx r0 @@ -66535,7 +66535,7 @@ _0809B744: adds r0, r1 ldr r0, [r0] movs r1, 0 - bl StartObjectImageAnim + bl StartSpriteAnim movs r0, 0 _0809B758: pop {r1} @@ -66599,7 +66599,7 @@ sub_809B7AC: @ 809B7AC adds r0, r1 ldr r0, [r0] movs r1, 0x3 - bl StartObjectImageAnim + bl StartSpriteAnim _0809B7C8: pop {r0} bx r0 @@ -69183,18 +69183,18 @@ sub_809CC04: @ 809CC04 ldm r0!, {r2,r3,r5} stm r1!, {r2,r3,r5} mov r0, sp - bl LoadObjectPics + bl LoadSpriteSheets adds r0, r4, 0 - bl LoadTaggedObjectPalettes + bl LoadSpritePalettes ldr r0, _0809CCB8 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag ldr r1, _0809CCBC ldr r6, [r1] ldr r4, _0809CCC0 adds r7, r6, r4 strb r0, [r7] ldr r0, _0809CCC4 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag ldr r5, _0809CCC8 adds r1, r6, r5 strb r0, [r1] @@ -69214,7 +69214,7 @@ sub_809CC04: @ 809CC04 movs r3, 0 ldrsh r2, [r5, r3] movs r3, 0x6 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 @@ -69244,7 +69244,7 @@ sub_809CC04: @ 809CC04 beq _0809CCEE ldr r0, [r4] movs r1, 0x3 - bl StartObjectImageAnim + bl StartSpriteAnim b _0809CCEE .align 2, 0 _0809CCB0: .4byte gUnknown_083BBBFC @@ -69285,7 +69285,7 @@ _0809CD08: ldr r0, _0809CD58 movs r1, 0 movs r2, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 @@ -70364,7 +70364,7 @@ sub_809D51C: @ 809D51C _0809D522: lsls r0, r4, 3 adds r0, r5 - bl LoadTaggedObjectPalette + bl LoadSpritePalette adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -70396,13 +70396,13 @@ _0809D552: lsls r0, 3 adds r4, r0, r1 ldrh r0, [r4, 0x4] - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF bne _0809D572 adds r0, r4, 0 - bl LoadTaggedObjectPalette + bl LoadSpritePalette _0809D572: pop {r4} pop {r0} @@ -70424,13 +70424,13 @@ sub_809D580: @ 809D580 lsls r0, 3 adds r4, r0, r1 ldrh r0, [r4, 0x4] - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF bne _0809D5A6 adds r0, r4, 0 - bl LoadTaggedObjectPalette + bl LoadSpritePalette _0809D5A6: pop {r4} pop {r0} @@ -70449,7 +70449,7 @@ _0809D5BA: lsls r0, r4, 3 adds r0, r5 ldrh r0, [r0, 0x4] - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -70481,7 +70481,7 @@ _0809D5EA: lsls r0, 3 adds r0, r1 ldrh r0, [r0, 0x4] - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag pop {r0} bx r0 .align 2, 0 @@ -70501,7 +70501,7 @@ sub_809D608: @ 809D608 lsls r0, 3 adds r0, r1 ldrh r0, [r0, 0x4] - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag pop {r0} bx r0 .align 2, 0 @@ -70579,7 +70579,7 @@ _0809D686: lsrs r1, 17 ldr r3, _0809D6E8 adds r1, r3 - bl AddTilesToObjectCopyRequests + bl RequestSpriteCopy mov r0, r8 ldrb r1, [r0] ldr r0, [r4, 0x8] @@ -70696,7 +70696,7 @@ sub_809D710: @ 809D710 adds r1, r4, 0 adds r2, r5, 0 mov r3, r8 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r6, _0809D7E4 @@ -70758,7 +70758,7 @@ sub_809D7E8: @ 809D7E8 str r1, [sp, 0x4] mov r1, sp str r1, [r0, 0xC] - bl RemoveObjectAndFreeTiles + bl DestroySprite add sp, 0x8 pop {r0} bx r0 @@ -70790,8 +70790,8 @@ sub_809D824: @ 809D824 sub_809D844: @ 809D844 push {lr} bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r0} bx r0 @@ -70824,8 +70824,8 @@ sub_809D85C: @ 809D85C ldr r0, _0809D8B8 ldrh r0, [r0] strh r0, [r1] - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -71126,7 +71126,7 @@ _0809DAB0: _0809DB0C: movs r0, 0 bl SetVBlankCallback - bl ResetAllObjectData + bl ResetSpriteData b _0809DDE8 _0809DB18: bl remove_some_task @@ -71138,7 +71138,7 @@ _0809DB18: _0809DB24: .4byte 0x03001770 _0809DB28: .4byte 0x0000043c _0809DB2C: - bl ResetObjectPaletteAllocator + bl FreeAllSpritePalettes b _0809DDE8 _0809DB32: movs r2, 0xC0 @@ -71865,8 +71865,8 @@ sub_809E13C: @ 809E13C ldr r4, _0809E190 ldrb r0, [r4, 0x9] strb r0, [r1] - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes bl sub_8075398 ldr r0, _0809E194 ldr r1, _0809E198 @@ -74311,7 +74311,7 @@ _0809F492: lsls r0, 2 ldr r1, _0809F4B0 adds r0, r1 - bl RemoveObjectAndFreeResources + bl DestroySpriteAndFreeResources ldr r1, _0809F4B4 ldr r0, _0809F4B8 adds r1, r0 @@ -74329,7 +74329,7 @@ _0809F4BC: lsls r0, 2 ldr r1, _0809F4D4 adds r0, r1 - bl RemoveObjectAndFreeResources + bl DestroySpriteAndFreeResources b _0809F5B2 .align 2, 0 _0809F4D0: .4byte 0x02018000 @@ -78730,7 +78730,7 @@ sub_80A1808: @ 80A1808 movs r1, 0x28 movs r2, 0x40 movs r3, 0x5 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 mov r8, r0 @@ -78740,7 +78740,7 @@ sub_80A1808: @ 80A1808 ldr r5, _080A1864 adds r7, r4, r5 adds r0, r7, 0 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix strh r6, [r7, 0x2E] adds r5, 0x1C adds r4, r5 @@ -78805,7 +78805,7 @@ _080A18B0: bx r0 .align 2, 0 _080A18B8: .4byte 0x0202f388 -_080A18BC: .4byte nullsub_2 +_080A18BC: .4byte SpriteCallbackDummy _080A18C0: .4byte 0x02018010 thumb_func_end sub_80A1888 @@ -78845,7 +78845,7 @@ sub_80A18E4: @ 80A18E4 lsls r0, 2 ldr r1, _080A1914 adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r0, 0xFF strb r0, [r4] _080A1908: @@ -78901,7 +78901,7 @@ _080A1954: movs r1, 0 movs r2, 0 movs r3, 0x2 - bl AddObjectToFront + bl CreateSprite strb r0, [r4] _080A196C: adds r0, r5, 0 @@ -78953,7 +78953,7 @@ sub_80A198C: @ 80A198C mov r9, r1 add r0, r9 adds r1, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim mov r1, r8 ldrb r0, [r1] lsls r1, r0, 4 @@ -79037,7 +79037,7 @@ _080A1A60: ldr r0, _080A1AA0 movs r2, 0x28 mov r3, r9 - bl AddObjectToFront + bl CreateSprite adds r1, r4, r5 mov r3, r8 adds r2, r1, r3 @@ -79052,7 +79052,7 @@ _080A1A60: lsls r0, 2 adds r0, r6 movs r1, 0x4 - bl StartObjectImageAnim + bl StartSpriteAnim b _080A1AD0 .align 2, 0 _080A1A98: .4byte 0x02018000 @@ -79070,7 +79070,7 @@ _080A1AA4: lsls r0, 2 adds r0, r6 movs r1, 0x5 - bl StartObjectImageAnim + bl StartSpriteAnim b _080A1AD0 _080A1AC0: ldrb r1, [r2] @@ -79079,7 +79079,7 @@ _080A1AC0: lsls r0, 2 adds r0, r6 movs r1, 0x6 - bl StartObjectImageAnim + bl StartSpriteAnim _080A1AD0: mov r0, r8 adds r2, r7, r0 @@ -79165,7 +79165,7 @@ sub_80A1B40: @ 80A1B40 lsls r2, 19 adds r1, r2 lsrs r1, 24 - bl StartObjectImageAnim + bl StartSpriteAnim movs r4, 0 adds r0, r7, 0x6 lsls r0, 24 @@ -79181,7 +79181,7 @@ _080A1B74: adds r0, r5 mov r2, r8 lsrs r1, r2, 24 - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -79195,7 +79195,7 @@ _080A1B74: adds r1, r7, 0x5 lsls r1, 24 lsrs r1, 24 - bl StartObjectImageAnim + bl StartSpriteAnim pop {r3} mov r8, r3 pop {r4-r7} @@ -79427,7 +79427,7 @@ sub_80A1D18: @ 80A1D18 movs r1, 0x40 movs r2, 0x98 movs r3, 0 - bl AddObjectToFront + bl CreateSprite strb r0, [r4] b _080A1D60 .align 2, 0 @@ -79446,7 +79446,7 @@ _080A1D60: ldr r1, _080A1D80 adds r0, r1 adds r1, r5, 0 - bl StartObjectImageAnim + bl StartSpriteAnim _080A1D74: add sp, 0x64 pop {r4,r5} @@ -79477,7 +79477,7 @@ sub_80A1D84: @ 80A1D84 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r1, [r6] movs r0, 0x3C strh r0, [r1, 0x20] @@ -79499,7 +79499,7 @@ sub_80A1DCC: @ 80A1DCC adds r4, r0, 0 ldr r0, _080A1DE4 ldr r0, [r0] - bl RemoveObjectAndFreeTiles + bl DestroySprite adds r0, r4, 0 bl sub_80A1D84 pop {r4} @@ -79530,7 +79530,7 @@ sub_80A1DE8: @ 80A1DE8 movs r1, 0x6 movs r2, 0x88 movs r3, 0 - bl AddObjectToFront + bl CreateSprite ldr r2, _080A1E4C strb r0, [r2, 0xD] ldr r3, _080A1E50 @@ -79559,7 +79559,7 @@ sub_80A1DE8: @ 80A1DE8 _080A1E48: .4byte gUnknown_0820AAB4 _080A1E4C: .4byte 0x02018000 _080A1E50: .4byte 0x02020004 -_080A1E54: .4byte nullsub_2 +_080A1E54: .4byte SpriteCallbackDummy thumb_func_end sub_80A1DE8 thumb_func_start sub_80A1E58 @@ -80789,7 +80789,7 @@ _080A2740: adds r2, 0x14 ldr r0, _080A27A0 movs r3, 0 - bl AddObjectToFront + bl CreateSprite ldr r1, _080A27A4 adds r1, r7, r1 strb r0, [r1] @@ -81240,7 +81240,7 @@ _080A2ABC: lsls r0, 2 ldr r5, _080A2AFC adds r0, r5 - bl RemoveObjectAndFreeTiles + bl DestroySprite adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -82082,8 +82082,8 @@ _080A3114: .4byte 0x0202e828 thumb_func_start sub_80A3118 sub_80A3118: @ 80A3118 push {lr} - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl RunTasks bl sub_80A740C bl fade_and_return_progress_probably @@ -82094,8 +82094,8 @@ sub_80A3118: @ 80A3118 thumb_func_start sub_80A3134 sub_80A3134: @ 80A3134 push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram ldr r1, _080A3168 ldr r2, _080A316C @@ -82206,7 +82206,7 @@ _080A3240: .4byte 0x0202f388 _080A3244: .4byte 0x03001770 _080A3248: .4byte 0x0000043c _080A324C: - bl ResetAllObjectData + bl ResetSpriteData b _080A3464 _080A3252: bl sub_80A3520 @@ -91443,7 +91443,7 @@ _080A7AA6: ldr r0, _080A7AC4 str r0, [r4, 0x10] adds r0, r4, 0 - bl obj_alloc_rotscale_entry + bl InitSpriteAffineAnim movs r0, 0x1 strh r0, [r4, 0x36] b _080A7ADC @@ -91482,7 +91482,7 @@ sub_80A7AE4: @ 80A7AE4 ldrb r0, [r0, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix pop {r0} bx r0 .align 2, 0 @@ -91496,7 +91496,7 @@ sub_80A7B10: @ 80A7B10 movs r1, 0x3A movs r2, 0x28 movs r3, 0 - bl AddObjectToFront + bl CreateSprite pop {r0} bx r0 .align 2, 0 @@ -91576,7 +91576,7 @@ _080A7BA0: _080A7BA2: str r0, [r4, 0x10] adds r0, r4, 0 - bl obj_alloc_rotscale_entry + bl InitSpriteAffineAnim movs r0, 0x1 strh r0, [r4, 0x34] adds r0, r4, 0 @@ -91620,7 +91620,7 @@ _080A7BD4: ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix ldrb r1, [r4, 0x1] movs r0, 0x4 negs r0, r0 @@ -91633,7 +91633,7 @@ _080A7C16: pop {r0} bx r0 .align 2, 0 -_080A7C1C: .4byte nullsub_2 +_080A7C1C: .4byte SpriteCallbackDummy thumb_func_end sub_80A7B6C thumb_func_start sub_80A7C20 @@ -91643,12 +91643,12 @@ sub_80A7C20: @ 80A7C20 lsls r4, 24 lsrs r4, 24 ldr r0, _080A7C54 - bl LoadTaggedObjectPalette + bl LoadSpritePalette ldr r0, _080A7C58 movs r1, 0x10 movs r2, 0x58 movs r3, 0 - bl AddObjectToFront + bl CreateSprite ldr r1, _080A7C5C strb r0, [r1] ldr r2, _080A7C60 @@ -91672,7 +91672,7 @@ _080A7C60: .4byte 0x02020004 sub_80A7C64: @ 80A7C64 push {r4,r5,lr} movs r0, 0x8 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag ldr r5, _080A7C98 ldr r4, _080A7C9C ldrb r1, [r4] @@ -91683,13 +91683,13 @@ sub_80A7C64: @ 80A7C64 ldrb r0, [r0, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r5 - bl RemoveObjectAndFreeTiles + bl DestroySprite pop {r4,r5} pop {r0} bx r0 @@ -91773,7 +91773,7 @@ sub_80A7CF8: @ 80A7CF8 orrs r0, r1 str r0, [sp, 0x4] mov r0, sp - bl LoadTaggedObjectPalette + bl LoadSpritePalette b _080A7D72 .align 2, 0 _080A7D34: .4byte 0x020288b0 @@ -91833,7 +91833,7 @@ sub_80A7D8C: @ 80A7D8C adds r1, r4, 0 adds r2, r5, 0 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 pop {r4,r5} @@ -91858,9 +91858,9 @@ _080A7DD0: .4byte 0x030041b4 sub_80A7DD4: @ 80A7DD4 push {lr} ldr r0, _080A7DE8 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag movs r0, 0x8 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag pop {r0} bx r0 .align 2, 0 @@ -91887,14 +91887,14 @@ sub_80A7DEC: @ 80A7DEC lsrs r0, 24 mov r8, r0 ldr r0, _080A7E50 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag adds r0, r4, 0 bl sub_80A7CF8 ldr r0, _080A7E54 adds r1, r5, 0 adds r2, r6, 0 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r1, r0, 24 adds r4, r1, 0 @@ -91907,7 +91907,7 @@ sub_80A7DEC: @ 80A7DEC ldr r1, _080A7E58 adds r0, r1 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim _080A7E42: adds r0, r4, 0 pop {r3} @@ -91930,7 +91930,7 @@ sub_80A7E5C: @ 80A7E5C asrs r1, 16 movs r2, 0x63 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 pop {r1} @@ -96500,8 +96500,8 @@ _080AA060: .4byte gUnknown_081E6C3C thumb_func_start sub_80AA064 sub_80AA064: @ 80AA064 push {lr} - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl RunTasks bl fade_and_return_progress_probably ldr r0, _080AA088 @@ -96553,8 +96553,8 @@ sub_80AA090: @ 80AA090 ldr r0, _080AA108 ldrh r0, [r0] strh r0, [r1] - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram bl sub_8089668 pop {r0} @@ -96587,9 +96587,9 @@ sub_80AA10C: @ 80AA10C bl sub_80A9F50 bl dp12_8087EA4 bl sub_8073B94 - bl ResetAllObjectData + bl ResetSpriteData bl ResetTasks - bl ResetObjectPaletteAllocator + bl FreeAllSpritePalettes bl sub_80A9FE4 ldr r0, _080AA23C bl SetVBlankCallback @@ -96666,9 +96666,9 @@ _080AA17A: movs r3, 0 bl sub_8003460 ldr r0, _080AA268 - bl LoadObjectPic + bl LoadSpriteSheet ldr r0, _080AA26C - bl LoadTaggedObjectPalette + bl LoadSpritePalette movs r0, 0x3 bl sub_80AA280 movs r0, 0x3 @@ -96682,7 +96682,7 @@ _080AA17A: ldr r2, _080AA278 ldrb r2, [r2, 0x1] movs r3, 0x5 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r2, _080AA27C @@ -98595,7 +98595,7 @@ sub_80AB084: @ 80AB084 movs r0, 0x8 strh r0, [r1] bl ResetTasks - bl ResetAllObjectData + bl ResetSpriteData ldr r0, _080AB170 bl SetMainCallback2 movs r2, 0xC0 @@ -99088,9 +99088,9 @@ _080AB4E0: orrs r0, r7 str r0, [r1, 0x8] ldr r0, [r1, 0x8] - bl ResetAllObjectData + bl ResetSpriteData bl ResetTasks - bl ResetObjectPaletteAllocator + bl FreeAllSpritePalettes ldr r1, _080AB544 movs r0, 0x4 strb r0, [r1] @@ -99770,9 +99770,9 @@ _080ABAA8: .4byte sub_80ABB70 thumb_func_start sub_80ABAAC sub_80ABAAC: @ 80ABAAC push {lr} - bl CallObjectCallbacks + bl AnimateSprites bl RunTasks - bl PrepareSpritesForOamLoad + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r0} bx r0 @@ -99830,8 +99830,8 @@ sub_80ABAC4: @ 80ABAC4 ldrh r0, [r0] strh r0, [r1] bl copy_pal_bg_faded_to_pal_ram - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl sub_8089668 pop {r0} bx r0 @@ -101081,7 +101081,7 @@ _080AC622: bl _080AD8CA .align 2, 0 _080AC62C: .4byte 0x02020004 -_080AC630: .4byte nullsub_2 +_080AC630: .4byte SpriteCallbackDummy _080AC634: .4byte 0x02019338 _080AC638: lsls r0, r7, 3 @@ -103191,9 +103191,9 @@ _080AD77C: b _080AD8CA _080AD7A2: adds r0, r6, 0 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix adds r0, r6, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r0, 0x14 strh r0, [r4, 0x8] b _080AD8CA @@ -103384,7 +103384,7 @@ _080AD924: pop {r0} bx r0 .align 2, 0 -_080AD928: .4byte nullsub_2 +_080AD928: .4byte SpriteCallbackDummy thumb_func_end sub_80AD8FC thumb_func_start sub_80AD92C @@ -103414,7 +103414,7 @@ _080AD956: pop {r0} bx r0 .align 2, 0 -_080AD95C: .4byte nullsub_2 +_080AD95C: .4byte SpriteCallbackDummy thumb_func_end sub_80AD92C thumb_func_start sub_80AD960 @@ -105370,7 +105370,7 @@ sub_80AE858: @ 80AE858 movs r1, 0x70 movs r2, 0x24 movs r3, 0x1E - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r4, _080AE8AC @@ -105396,7 +105396,7 @@ _080AE8A0: .4byte gUnknown_083CA4BC _080AE8A4: .4byte gUnknown_08D1CA1C _080AE8A8: .4byte gUnknown_083CA4A4 _080AE8AC: .4byte 0x02020004 -_080AE8B0: .4byte nullsub_2 +_080AE8B0: .4byte SpriteCallbackDummy thumb_func_end sub_80AE858 thumb_func_start sub_80AE8B4 @@ -105410,7 +105410,7 @@ sub_80AE8B4: @ 80AE8B4 movs r1, 0x60 movs r2, 0xA movs r3, 0x1D - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r1, _080AE904 @@ -105503,7 +105503,7 @@ sub_80AE908: @ 80AE908 asrs r2, 16 movs r1, 0x70 movs r3, 0x1E - bl AddObjectToFront + bl CreateSprite adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -105528,7 +105528,7 @@ sub_80AE908: @ 80AE908 ldr r1, _080AE9F8 str r1, [r3] movs r1, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim adds r0, r4, 0 add sp, 0x8 pop {r3-r5} @@ -105547,7 +105547,7 @@ _080AE9E4: .4byte gUnknown_081FAF4C _080AE9E8: .4byte gMonPaletteTable _080AE9EC: .4byte 0x02024e8c _080AE9F0: .4byte 0x02020004 -_080AE9F4: .4byte nullsub_2 +_080AE9F4: .4byte SpriteCallbackDummy _080AE9F8: .4byte gUnknown_081E7C18 thumb_func_end sub_80AE908 @@ -105603,7 +105603,7 @@ sub_80AE9FC: @ 80AE9FC adds r0, r4, 0 movs r1, 0x70 movs r3, 0x1E - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r7, r0, 24 ldr r0, _080AEADC @@ -105654,7 +105654,7 @@ _080AEAD0: .4byte gUnknown_081E9114 _080AEAD4: .4byte gUnknown_081FAF4C _080AEAD8: .4byte 0x02024e8c _080AEADC: .4byte 0x02020004 -_080AEAE0: .4byte nullsub_2 +_080AEAE0: .4byte SpriteCallbackDummy _080AEAE4: .4byte gUnknown_081E7C18 _080AEAE8: mov r0, r8 @@ -105669,7 +105669,7 @@ _080AEAF0: ldr r1, _080AEB18 adds r0, r1 movs r1, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim adds r0, r7, 0 add sp, 0xC pop {r3,r4} @@ -107695,7 +107695,7 @@ _080AF9D0: ldr r2, _080AFA08 adds r1, r2 movs r2, 0x2 - bl AddTilesToObjectCopyRequests + bl RequestSpriteCopy b _080AFA56 .align 2, 0 _080AFA00: .4byte 0x03004b20 @@ -107715,7 +107715,7 @@ _080AFA0C: ldr r7, _080AFA34 adds r1, r7 movs r2, 0x2 - bl AddTilesToObjectCopyRequests + bl RequestSpriteCopy ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] @@ -108248,7 +108248,7 @@ _080AFE2C: .4byte 0x03004b20 sub_80AFE30: @ 80AFE30 push {r4,r5,lr} ldr r0, _080AFE64 - bl LoadObjectPic + bl LoadSpriteSheet movs r4, 0 ldr r5, _080AFE68 _080AFE3C: @@ -108260,7 +108260,7 @@ _080AFE3C: ldr r0, _080AFE70 movs r1, 0xB4 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite lsls r1, r4, 2 ldr r2, _080AFE74 adds r1, r2 @@ -108438,7 +108438,7 @@ sub_80AFF60: @ 80AFF60 b _080AFF9A .align 2, 0 _080AFF8C: .4byte 0x02019338 -_080AFF90: .4byte nullsub_2 +_080AFF90: .4byte SpriteCallbackDummy _080AFF94: ldrh r0, [r3, 0x32] adds r0, r2, r0 @@ -108535,7 +108535,7 @@ sub_80B0034: @ 80B0034 mov r7, r8 push {r7} ldr r0, _080B00A8 - bl LoadTaggedObjectPalette + bl LoadSpritePalette movs r5, 0 ldr r0, _080B00AC mov r8, r0 @@ -108555,7 +108555,7 @@ _080B004A: ldrb r2, [r1] movs r1, 0xCC movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r4, r5, 2 ldr r1, _080B00C0 adds r4, r1 @@ -108566,7 +108566,7 @@ _080B004A: lsls r0, 2 adds r0, r7 ldr r1, _080B00C4 - bl SetSpriteOamTables_NoPriorityFromTable + bl SetSubspriteTables ldrb r1, [r4, 0x1] lsls r0, r1, 4 adds r0, r1 @@ -108603,12 +108603,12 @@ sub_80B00C8: @ 80B00C8 ldr r0, _080B0104 bl LoadCompressedObjectPic ldr r0, _080B0108 - bl LoadTaggedObjectPalette + bl LoadSpritePalette ldr r0, _080B010C movs r1, 0x1E movs r2, 0x2C movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r2, _080B0110 @@ -108674,7 +108674,7 @@ _080B014A: add r2, r8 ldrb r2, [r2] movs r3, 0x5 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -108778,7 +108778,7 @@ _080B021A: .align 2, 0 _080B0224: .4byte 0x02020004 _080B0228: .4byte 0x02019204 -_080B022C: .4byte nullsub_2 +_080B022C: .4byte SpriteCallbackDummy _080B0230: movs r0, 0x1 _080B0232: @@ -108799,7 +108799,7 @@ ObjectCB_SwitchPocketRotatingBallInit: @ 80B0238 orrs r0, r1 strb r0, [r4, 0x1] adds r0, r4, 0 - bl obj_alloc_rotscale_entry + bl InitSpriteAffineAnim adds r0, r4, 0 adds r0, 0x3E ldrb r1, [r0] @@ -108814,7 +108814,7 @@ _080B0264: .4byte sub_80B02A8 _080B0268: adds r0, r4, 0 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim ldr r0, _080B027C _080B0272: str r0, [r4, 0x1C] @@ -108872,10 +108872,10 @@ sub_80B02A8: @ 80B02A8 lsls r1, 30 lsrs r1, 30 adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r4, 0 movs r1, 0x2 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim ldr r0, _080B02F0 str r0, [r4, 0x1C] movs r0, 0x18 @@ -108899,7 +108899,7 @@ sub_80B02F4: @ 80B02F4 cmp r0, 0 beq _080B0318 adds r0, r4, 0 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix ldrb r0, [r4, 0x1] movs r1, 0x4 negs r1, r1 @@ -108912,7 +108912,7 @@ _080B0318: pop {r0} bx r0 .align 2, 0 -_080B0320: .4byte nullsub_2 +_080B0320: .4byte SpriteCallbackDummy thumb_func_end sub_80B02F4 thumb_func_start sub_80B0324 @@ -109853,7 +109853,7 @@ sub_80B09E4: @ 80B09E4 ldr r0, _080B0B34 adds r4, r0 adds r0, r4, 0 - bl LoadTaggedObjectPalette + bl LoadSpritePalette mov r3, r9 lsls r4, r3, 1 add r4, r9 @@ -109864,7 +109864,7 @@ sub_80B09E4: @ 80B09E4 movs r1, 0xB8 adds r2, r5, 0 movs r3, 0x1D - bl AddObjectToFront + bl CreateSprite mov r8, r0 mov r0, r8 lsls r0, 24 @@ -109874,7 +109874,7 @@ sub_80B09E4: @ 80B09E4 movs r1, 0xF8 adds r2, r5, 0 movs r3, 0x1D - bl AddObjectToFront + bl CreateSprite adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 @@ -110016,11 +110016,11 @@ sub_80B0B5C: @ 80B0B5C lsls r4, 2 adds r4, r1 adds r0, r4, 0 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite adds r0, r5, 0 - bl RemoveObjectAndFreeResources + bl DestroySpriteAndFreeResources pop {r4,r5} pop {r0} bx r0 @@ -110091,14 +110091,14 @@ sub_80B0BC4: @ 80B0BC4 lsls r5, 24 lsrs r5, 24 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim lsls r4, r5, 4 adds r4, r5 lsls r4, 2 mov r1, r8 adds r0, r4, r1 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim movs r0, 0x1C add r8, r0 add r6, r8 @@ -110117,7 +110117,7 @@ sub_80B0BC4: @ 80B0BC4 _080B0C38: .4byte 0x02020004 _080B0C3C: .4byte 0x02019338 _080B0C40: .4byte sub_80B0C5C -_080B0C44: .4byte nullsub_2 +_080B0C44: .4byte SpriteCallbackDummy _080B0C48: movs r0, 0x2 bl audio_play @@ -111558,7 +111558,7 @@ _080B1702: pop {r0} bx r0 .align 2, 0 -_080B1708: .4byte nullsub_2 +_080B1708: .4byte SpriteCallbackDummy _080B170C: .4byte 0x02019204 thumb_func_end sub_80B16D0 @@ -111951,7 +111951,7 @@ sub_80B1A2C: @ 80B1A2C movs r0, 0x1 strh r0, [r4, 0xA] ldr r0, _080B1A68 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0xC] @@ -113477,7 +113477,7 @@ sub_80B25E4: @ 80B25E4 movs r6, 0 ldr r5, _080B26B4 _080B25F6: - bl rotscale_alloc_entry + bl AllocOamMatrix lsls r1, r6, 2 ldr r2, _080B26B8 mov r8, r2 @@ -113518,7 +113518,7 @@ _080B25F6: lsls r0, 2 adds r0, r5 mov r1, r9 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim mov r7, r9 cmp r7, 0x2 bne _080B267A @@ -113527,7 +113527,7 @@ _080B25F6: adds r0, r1 lsls r0, 2 adds r0, r5 - bl AnimateObject + bl AnimateSprite ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -113631,7 +113631,7 @@ _080B271A: lsls r0, 2 ldr r1, _080B2750 adds r0, r1 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix adds r4, 0x1 cmp r4, 0x3 ble _080B271A @@ -113915,12 +113915,12 @@ sub_80B292C: @ 80B292C lsls r0, 2 ldr r1, _080B2964 adds r0, r1 - bl obj_alloc_rotscale_entry + bl InitSpriteAffineAnim bl sub_80B2968 pop {r0} bx r0 .align 2, 0 -_080B2958: .4byte nullsub_2 +_080B2958: .4byte SpriteCallbackDummy _080B295C: .4byte 0x02024be0 _080B2960: .4byte 0x02024c08 _080B2964: .4byte 0x02020004 @@ -114835,8 +114835,8 @@ _080B3090: .4byte Task_ExitSellMenu thumb_func_start sub_80B3094 sub_80B3094: @ 80B3094 push {lr} - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl RunTasks bl fade_and_return_progress_probably pop {r0} @@ -114846,8 +114846,8 @@ sub_80B3094: @ 80B3094 thumb_func_start sub_80B30AC sub_80B30AC: @ 80B30AC push {r4,lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram ldr r3, _080B30F0 ldr r1, _080B30F4 @@ -114934,9 +114934,9 @@ BuyMenuDrawGraphics: @ 80B3108 movs r1, 0xC0 movs r2, 0x20 bl decompress_palette - bl ResetObjectPaletteAllocator + bl FreeAllSpritePalettes bl sub_8073B94 - bl ResetAllObjectData + bl ResetSpriteData bl ResetTasks ldr r4, _080B3228 adds r0, r4, 0 @@ -115629,7 +115629,7 @@ _080B369E: adds r0, r4, r1 ldrb r1, [r0] adds r0, r2, 0 - bl StartObjectImageAnim + bl StartSpriteAnim _080B36F8: adds r0, r5, 0x1 lsls r0, 24 @@ -115645,7 +115645,7 @@ _080B36F8: .align 2, 0 _080B3710: .4byte 0x020386a4 _080B3714: .4byte 0x030048a0 -_080B3718: .4byte nullsub_2 +_080B3718: .4byte SpriteCallbackDummy _080B371C: .4byte 0x02020004 thumb_func_end sub_80B368C @@ -120074,7 +120074,7 @@ sub_80B58C4: @ 80B58C4 _080B595C: .4byte task_picbox _080B5960: .4byte 0x03004b20 _080B5964: .4byte 0x02020004 -_080B5968: .4byte nullsub_2 +_080B5968: .4byte SpriteCallbackDummy _080B596C: movs r0, 0 _080B596E: @@ -120235,8 +120235,8 @@ _080B5A9C: .4byte sub_80B5AA0 sub_80B5AA0: @ 80B5AA0 push {lr} bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r0} bx r0 @@ -120245,8 +120245,8 @@ sub_80B5AA0: @ 80B5AA0 thumb_func_start sub_80B5AB8 sub_80B5AB8: @ 80B5AB8 push {r4,lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram ldr r1, _080B5B00 ldr r4, _080B5B04 @@ -120652,8 +120652,8 @@ _080B5DE0: .4byte gUnknown_081E6E88 NamingScreen_ResetObjects: @ 80B5DE4 push {lr} bl sub_8073B94 - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes bl ResetTasks pop {r0} bx r0 @@ -121662,7 +121662,7 @@ sub_80B654C: @ 80B654C lsls r4, 24 lsrs r4, 24 movs r0, 0x4 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 20 movs r1, 0x87 @@ -121672,7 +121672,7 @@ sub_80B654C: @ 80B654C add r6, sp, 0x8 strh r0, [r6] movs r0, 0x6 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 20 movs r1, 0x86 @@ -121682,7 +121682,7 @@ sub_80B654C: @ 80B654C adds r1, 0xA strh r0, [r1] movs r0, 0x6 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 20 adds r0, r5 @@ -121957,7 +121957,7 @@ sub_80B6774: @ 80B6774 movs r1, 0 movs r2, 0 movs r3, 0 - bl AddObjectToFront + bl CreateSprite ldr r4, _080B67E4 strb r0, [r4, 0xF] ldr r5, _080B67E8 @@ -122125,7 +122125,7 @@ sub_80B6888: @ 80B6888 lsls r0, 2 adds r0, r5 movs r1, 0 - bl StartObjectImageAnim + bl StartSpriteAnim pop {r4,r5} pop {r0} bx r0 @@ -122178,7 +122178,7 @@ sub_80B6914: @ 80B6914 ldr r1, _080B6934 adds r0, r1 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim pop {r0} bx r0 .align 2, 0 @@ -122251,7 +122251,7 @@ sub_80B6998: @ 80B6998 beq _080B69B0 adds r0, r4, 0 movs r1, 0 - bl StartObjectImageAnim + bl StartSpriteAnim _080B69B0: ldrh r1, [r4, 0x36] movs r0, 0xFF @@ -122345,7 +122345,7 @@ _080B6A3E: lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 4 ldr r2, _080B6A7C @@ -122370,7 +122370,7 @@ sub_80B6A80: @ 80B6A80 movs r1, 0xCC movs r2, 0x50 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r1, _080B6AFC @@ -122382,12 +122382,12 @@ sub_80B6A80: @ 80B6A80 adds r4, r5 ldr r1, _080B6B04 adds r0, r4, 0 - bl SetSpriteOamTables_NoPriorityFromTable + bl SetSubspriteTables ldr r0, _080B6B08 movs r1, 0xCC movs r2, 0x4C movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x3A] @@ -122397,12 +122397,12 @@ sub_80B6A80: @ 80B6A80 adds r2, r5 ldr r1, _080B6B0C adds r0, r2, 0 - bl SetSpriteOamTables_NoPriorityFromTable + bl SetSubspriteTables ldr r0, _080B6B10 movs r1, 0xCC movs r2, 0x4B movs r3, 0x2 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -122617,7 +122617,7 @@ sub_80B6C48: @ 80B6C48 lsls r4, r5, 1 adds r0, r4, r0 ldrh r0, [r0] - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 4 mov r1, r8 ldrb r2, [r1, 0x5] @@ -122629,7 +122629,7 @@ sub_80B6C48: @ 80B6C48 ldr r0, _080B6CA4 adds r4, r0 ldrh r0, [r4] - bl GetObjectTileRangeStartByTag + bl GetSpriteTileStartByTag adds r1, r6, 0 adds r1, 0x40 strh r0, [r1] @@ -122659,7 +122659,7 @@ sub_80B6CA8: @ 80B6CA8 movs r1, 0xCC movs r2, 0x6C movs r3, 0 - bl AddObjectToFront + bl CreateSprite adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -122670,12 +122670,12 @@ sub_80B6CA8: @ 80B6CA8 adds r0, r4 ldr r5, _080B6CFC adds r1, r5, 0 - bl SetSpriteOamTables_NoPriorityFromTable + bl SetSubspriteTables ldr r0, _080B6D00 movs r1, 0xCC movs r2, 0x84 movs r3, 0 - bl AddObjectToFront + bl CreateSprite adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -122684,7 +122684,7 @@ sub_80B6CA8: @ 80B6CA8 lsls r0, 2 adds r0, r4 adds r1, r5, 0 - bl SetSpriteOamTables_NoPriorityFromTable + bl SetSubspriteTables pop {r4,r5} pop {r0} bx r0 @@ -122708,7 +122708,7 @@ sub_80B6D04: @ 80B6D04 asrs r1, 16 movs r2, 0x28 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r1, r0, 24 ldr r3, _080B6D94 @@ -122738,7 +122738,7 @@ _080B6D4A: adds r1, r4, 0 movs r2, 0x2C movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r1, r0, 24 lsls r0, r1, 4 @@ -122918,13 +122918,13 @@ sub_80B6E68: @ 80B6E68 orrs r1, r2 strb r1, [r0, 0x5] movs r1, 0x4 - bl StartObjectImageAnim + bl StartSpriteAnim add sp, 0x4 pop {r0} bx r0 .align 2, 0 _080B6EB0: .4byte 0x02000000 -_080B6EB4: .4byte nullsub_2 +_080B6EB4: .4byte SpriteCallbackDummy _080B6EB8: .4byte 0x02020004 thumb_func_end sub_80B6E68 @@ -122935,7 +122935,7 @@ sub_80B6EBC: @ 80B6EBC movs r1, 0x34 movs r2, 0x18 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r4, r0, 4 @@ -122945,7 +122945,7 @@ sub_80B6EBC: @ 80B6EBC adds r4, r0 ldr r1, _080B6EF8 adds r0, r4, 0 - bl SetSpriteOamTables_NoPriorityFromTable + bl SetSubspriteTables ldrb r0, [r4, 0x5] movs r1, 0xC orrs r0, r1 @@ -122990,7 +122990,7 @@ sub_80B6EFC: @ 80B6EFC bx r0 .align 2, 0 _080B6F38: .4byte 0x02000000 -_080B6F3C: .4byte nullsub_2 +_080B6F3C: .4byte SpriteCallbackDummy _080B6F40: .4byte 0x02020004 thumb_func_end sub_80B6EFC @@ -123849,9 +123849,9 @@ _080B7538: .4byte gUnknown_081E6E88 sub_80B753C: @ 80B753C push {lr} ldr r0, _080B7550 - bl LoadObjectPics + bl LoadSpriteSheets ldr r0, _080B7554 - bl LoadTaggedObjectPalettes + bl LoadSpritePalettes pop {r0} bx r0 .align 2, 0 @@ -124839,7 +124839,7 @@ sub_80B7C14: @ 80B7C14 adds r1, r6, 0 adds r2, r5, 0 movs r3, 0 - bl AddObjectToFront + bl CreateSprite ldr r1, _080B7C94 strb r0, [r1] pop {r3} @@ -124870,9 +124870,9 @@ RemoveMoneyLabelObject: @ 80B7C98 lsls r0, 2 ldr r1, _080B7CE0 adds r0, r1 - bl RemoveObjectAndFreeResources + bl DestroySpriteAndFreeResources ldr r0, _080B7CE4 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag adds r2, r4, 0 adds r2, 0xD lsls r2, 24 @@ -129634,8 +129634,8 @@ _080BA0A4: .4byte 0x03002fa4 sub_80BA0A8: @ 80BA0A8 push {lr} bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r0} bx r0 @@ -129644,8 +129644,8 @@ sub_80BA0A8: @ 80BA0A8 thumb_func_start sub_80BA0C0 sub_80BA0C0: @ 80BA0C0 push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram ldr r0, _080BA0E8 ldrb r0, [r0] @@ -129720,7 +129720,7 @@ sub_80BA0EC: @ 80BA0EC ldr r0, [r1, 0x8] bl sub_8073B94 bl ResetTasks - bl ResetAllObjectData + bl ResetSpriteData ldr r0, _080BA220 bl ShowBg ldr r0, _080BA224 @@ -131801,8 +131801,8 @@ sub_80BB25C: @ 80BB25C ldr r1, _080BB37C movs r0, 0x1 strh r0, [r1] - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes ldr r1, _080BB380 ldr r0, [sp, 0x4] ands r0, r1 @@ -146003,9 +146003,9 @@ sub_80C2358: @ 80C2358 bl sub_80C2020 bl dp12_8087EA4 bl sub_8073B94 - bl ResetAllObjectData + bl ResetSpriteData bl ResetTasks - bl ResetObjectPaletteAllocator + bl FreeAllSpritePalettes bl sub_80C2144 bl sub_80C310C movs r0, 0 @@ -146075,8 +146075,8 @@ _080C242C: .4byte sub_80C2448 thumb_func_start sub_80C2430 sub_80C2430: @ 80C2430 push {lr} - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl RunTasks bl fade_and_return_progress_probably pop {r0} @@ -146134,8 +146134,8 @@ sub_80C2448: @ 80C2448 ldr r0, _080C24F0 ldrh r0, [r0] strh r0, [r1] - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram bl sub_8089668 pop {r0} @@ -146978,7 +146978,7 @@ _080C2B14: lsls r1, 1 movs r2, 0x50 movs r3, 0xA - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r5, _080C2BEC @@ -147644,7 +147644,7 @@ _080C30B0: adds r1, r2 movs r2, 0xC0 lsls r2, 1 - bl AddTilesToObjectCopyRequests + bl RequestSpriteCopy _080C30CA: pop {r4-r6} pop {r0} @@ -148037,13 +148037,13 @@ sub_80C33DC: @ 80C33DC movs r4, 0x7 _080C33F2: adds r0, r6, 0 - bl LoadObjectPic + bl LoadSpriteSheet adds r6, 0x8 subs r4, 0x1 cmp r4, 0 bge _080C33F2 ldr r0, _080C34A0 - bl LoadTaggedObjectPalette + bl LoadSpritePalette movs r4, 0 mov r6, sp _080C340A: @@ -148052,7 +148052,7 @@ _080C340A: lsls r1, 1 movs r2, 0x90 movs r3, 0xA - bl AddObjectToFront + bl CreateSprite adds r1, r5, r4 strb r0, [r1] ldrh r0, [r6] @@ -148238,7 +148238,7 @@ sub_80C3564: @ 80C3564 strb r3, [r0, 0x4] bx lr .align 2, 0 -_080C3580: .4byte nullsub_2 +_080C3580: .4byte SpriteCallbackDummy _080C3584: .4byte 0x02018000 thumb_func_end sub_80C3564 @@ -149181,7 +149181,7 @@ _080C3CA8: pop {r0} bx r0 .align 2, 0 -_080C3CB0: .4byte nullsub_2 +_080C3CB0: .4byte SpriteCallbackDummy _080C3CB4: .4byte 0x02018000 thumb_func_end sub_80C3C44 @@ -149223,7 +149223,7 @@ _080C3CF8: pop {r0} bx r0 .align 2, 0 -_080C3CFC: .4byte nullsub_2 +_080C3CFC: .4byte SpriteCallbackDummy _080C3D00: .4byte 0x02018000 thumb_func_end sub_80C3CB8 @@ -149266,7 +149266,7 @@ sub_80C3D04: @ 80C3D04 adds r0, r4, 0 movs r2, 0x2C movs r3, 0x5 - bl AddObjectToFront + bl CreateSprite adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -149384,7 +149384,7 @@ _080C3E3A: ble _080C3E56 _080C3E4A: adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldrb r0, [r5, 0x7] subs r0, 0x1 strb r0, [r5, 0x7] @@ -151845,7 +151845,7 @@ sub_80C5050: @ 80C5050 movs r1, 0x78 movs r2, 0x40 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0xC] @@ -151886,7 +151886,7 @@ _080C5150: .4byte gUnknown_081E7C74 _080C5154: .4byte gUnknown_081FAF4C _080C5158: .4byte 0x02024e8c _080C515C: .4byte 0x02020004 -_080C5160: .4byte nullsub_2 +_080C5160: .4byte SpriteCallbackDummy thumb_func_end sub_80C5050 thumb_func_start sub_80C5164 @@ -151951,10 +151951,10 @@ _080C51C2: adds r5, r0, r1 ldrb r0, [r5, 0x5] lsrs r0, 4 - bl gpu_pal_tag_by_index + bl GetSpritePaletteTagByPaletteNum lsls r0, 16 lsrs r0, 16 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag ldrb r0, [r5, 0x1] lsls r0, 30 cmp r0, 0 @@ -151962,10 +151962,10 @@ _080C51C2: ldrb r0, [r5, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix _080C51F2: adds r0, r5, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080C51F8: ldrh r0, [r4, 0x8] adds r0, 0x1 @@ -153431,15 +153431,15 @@ sub_80C5CD4: @ 80C5CD4 str r1, [r4, 0x4] mov r1, sp strh r2, [r1, 0x2] - bl LoadObjectPic + bl LoadSpriteSheet adds r0, r4, 0 - bl LoadTaggedObjectPalette + bl LoadSpritePalette movs r0, 0x1 strh r0, [r7, 0xC] strh r6, [r7, 0xA] strh r6, [r7, 0x8] ldrh r0, [r7, 0x2] - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 24 movs r1, 0x80 @@ -153495,7 +153495,7 @@ _080C5D94: mov r0, sp movs r2, 0x50 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -153610,15 +153610,15 @@ sub_80C5E38: @ 80C5E38 str r1, [r4, 0x4] mov r1, sp strh r2, [r1, 0x2] - bl LoadObjectPic + bl LoadSpriteSheet adds r0, r4, 0 - bl LoadTaggedObjectPalette + bl LoadSpritePalette movs r0, 0x50 strh r0, [r7, 0xC] strh r6, [r7, 0x8] strh r6, [r7, 0xA] ldrh r0, [r7, 0x2] - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 24 movs r1, 0x80 @@ -153672,7 +153672,7 @@ _080C5EF8: mov r0, sp movs r2, 0x50 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 @@ -153718,7 +153718,7 @@ _080C5F4A: mov r0, sp movs r2, 0x50 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 @@ -153806,10 +153806,10 @@ _080C6008: adds r0, 0x4 strh r1, [r0] ldrh r0, [r2] - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag ldr r0, [r4] ldrh r0, [r0, 0x2] - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag bl ClearGpuRegBits ldr r1, [r4] ldrh r0, [r1, 0x8] @@ -153921,7 +153921,7 @@ sub_80C60CC: @ 80C60CC cmp r0, r1 bls _080C611C adds r0, r2, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r4, _080C6124 ldr r1, [r4] ldrh r0, [r1, 0xA] @@ -153932,10 +153932,10 @@ sub_80C60CC: @ 80C60CC cmp r0, 0x8 bne _080C611C ldrh r0, [r1] - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag ldr r0, [r4] ldrh r0, [r0, 0x2] - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag ldr r0, [r4] ldr r0, [r0, 0x10] ldr r2, _080C6128 @@ -154340,7 +154340,7 @@ sub_80C63FC: @ 80C63FC lsls r2, 16 asrs r2, 16 movs r3, 0x94 - bl AddObjectToFront + bl CreateSprite movs r0, 0 pop {r4} pop {r1} @@ -154507,7 +154507,7 @@ _080C6534: lsls r2, 16 asrs r2, 16 movs r3, 0x94 - bl AddObjectToFront + bl CreateSprite ldr r0, [r4, 0x1C] cmp r0, 0x1 beq _080C6572 @@ -154672,7 +154672,7 @@ sub_80C666C: @ 80C666C lsls r2, 16 asrs r2, 16 movs r3, 0x94 - bl AddObjectToFront + bl CreateSprite movs r0, 0 pop {r4} pop {r1} @@ -155388,7 +155388,7 @@ _080C6C7C: cmp r0, 0x1F ble _080C6C8A adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080C6C8A: pop {r4} pop {r0} @@ -155431,7 +155431,7 @@ sub_80C6C90: @ 80C6C90 movs r3, 0 ldrsh r2, [r4, r3] movs r3, 0 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -155534,7 +155534,7 @@ _080C6D86: ldrb r2, [r2] adds r2, 0x20 movs r3, 0 - bl AddObjectToFront + bl CreateSprite b _080C6E4C .align 2, 0 _080C6DB0: .4byte gUnknown_083D26A0 @@ -155581,7 +155581,7 @@ _080C6DEC: adds r2, 0x10 _080C6E0C: movs r3, 0x94 - bl AddObjectToFront + bl CreateSprite b _080C6E4C .align 2, 0 _080C6E14: .4byte gUnknown_083D26A0 @@ -155607,7 +155607,7 @@ _080C6E24: ldrb r2, [r2] adds r2, 0x10 movs r3, 0x94 - bl AddObjectToFront + bl CreateSprite _080C6E4C: movs r0, 0 add sp, 0x4 @@ -156068,12 +156068,12 @@ _080C71D4: .4byte sub_80C70A0 sub_80C71D8: @ 80C71D8 push {r4,r5,lr} ldr r0, _080C722C - bl LoadTaggedObjectPalette + bl LoadSpritePalette ldr r0, _080C7230 movs r1, 0 movs r2, 0 movs r3, 0x52 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x40 @@ -156132,9 +156132,9 @@ _080C724A: cmp r1, r0 bne _080C7264 adds r0, r4, 0 - bl FreeObjectPalette + bl FreeSpritePalette adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080C7264: adds r4, 0x44 adds r6, 0x44 @@ -156954,10 +156954,10 @@ sub_80C78A0: @ 80C78A0 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim b _080C7912 .align 2, 0 -_080C78F4: .4byte nullsub_2 +_080C78F4: .4byte SpriteCallbackDummy _080C78F8: .4byte 0x02020004 _080C78FC: .4byte 0x000040b4 _080C7900: @@ -156967,7 +156967,7 @@ _080C7900: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim _080C7912: add sp, 0x4 pop {r4} @@ -157368,7 +157368,7 @@ _080C7BE8: movs r1, 0 movs r2, 0 movs r3, 0x94 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x40 @@ -157419,7 +157419,7 @@ _080C7BE8: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim adds r0, r5, 0 b _080C7C86 .align 2, 0 @@ -157468,7 +157468,7 @@ _080C7CCA: bl audio_play adds r0, r6, 0 adds r1, r4, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim b _080C7D08 _080C7CDA: cmp r5, 0x2 @@ -157491,7 +157491,7 @@ _080C7CFA: bl audio_play adds r0, r6, 0 adds r1, r4, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim _080C7D08: movs r0, 0 strh r0, [r6, 0x30] @@ -157589,7 +157589,7 @@ _080C7DAC: .4byte 0x030027e0 LoadRotatingGatePics: @ 80C7DB0 push {lr} ldr r0, _080C7DBC - bl LoadObjectPics + bl LoadSpriteSheets pop {r0} bx r0 .align 2, 0 @@ -157674,9 +157674,9 @@ _080C7E44: ldr r0, _080C7E84 adds r4, r0 adds r0, r4, 0 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r0, 0x40 strb r0, [r5] _080C7E64: @@ -163080,7 +163080,7 @@ sub_80CA800: @ 80CA800 ldr r5, _080CA848 ldrb r1, [r5, 0x6] adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldrh r0, [r5, 0x4] strh r0, [r4, 0x2E] ldr r5, _080CA84C @@ -163163,7 +163163,7 @@ sub_80CA8B4: @ 80CA8B4 cmp r0, 0 beq _080CA8CA adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite b _080CA91E _080CA8CA: movs r1, 0x38 @@ -163257,7 +163257,7 @@ sub_80CA928: @ 80CA928 adds r0, r4, 0 movs r1, 0 movs r2, 0 - bl AddObjectAndAnimateForOneFrame + bl CreateSpriteAndAnimate _080CA982: movs r1, 0xA ldrsh r0, [r5, r1] @@ -163340,7 +163340,7 @@ sub_80CAA14: @ 80CAA14 movs r0, 0x7 ands r1, r0 adds r0, r5, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r4, _080CAA5C ldrb r0, [r4] movs r1, 0x2 @@ -163554,7 +163554,7 @@ sub_80CABC0: @ 80CABC0 strb r0, [r2] adds r0, r4, 0 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim movs r0, 0x3C strh r0, [r4, 0x2E] ldr r0, _080CABF0 @@ -163579,7 +163579,7 @@ sub_80CABF8: @ 80CABF8 ldr r5, _080CAC3C ldrb r1, [r5, 0x8] adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0x1 @@ -164425,7 +164425,7 @@ sub_80CB25C: @ 80CB25C ldr r4, _080CB290 ldrb r1, [r4, 0x4] adds r0, r5, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim ldrh r0, [r4, 0x4] strh r0, [r5, 0x3A] ldrh r0, [r4, 0x6] @@ -164521,7 +164521,7 @@ _080CB30C: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim b _080CB33A _080CB334: adds r0, r4, 0 @@ -164801,7 +164801,7 @@ _080CB538: beq _080CB58A adds r0, r5, 0 movs r1, 0x1 - bl sub_8002068 + bl ChangeSpriteAffineAnim movs r0, 0x19 strh r0, [r5, 0x2E] ldr r4, _080CB590 @@ -164865,7 +164865,7 @@ sub_80CB59C: @ 80CB59C strb r0, [r1] ldrb r1, [r4, 0x6] adds r0, r5, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldrh r0, [r4, 0x8] strh r0, [r5, 0x32] ldrh r0, [r5, 0x2E] @@ -164977,7 +164977,7 @@ sub_80CB620: @ 80CB620 strb r0, [r1] ldrb r1, [r6, 0x8] mov r0, r9 - bl StartObjectImageAnim + bl StartSpriteAnim ldrh r0, [r6, 0xA] mov r1, r9 strh r0, [r1, 0x32] @@ -165246,7 +165246,7 @@ sub_80CB8B8: @ 80CB8B8 bne _080CB8CC adds r0, r4, 0 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim _080CB8CC: ldrh r0, [r4, 0x2E] adds r0, 0x1 @@ -165759,7 +165759,7 @@ _080CBC9E: strh r0, [r4, 0x34] adds r0, r4, 0 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim b _080CBCEE _080CBCB6: movs r1, 0x36 @@ -166000,7 +166000,7 @@ _080CBE5C: movs r3, 0x1A ldrsh r2, [r5, r3] ldrb r3, [r5, 0x10] - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0xC] @@ -166258,7 +166258,7 @@ _080CC038: strb r0, [r1] ldrb r1, [r6, 0xE] adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r4, 0 bl sub_80786EC ldrh r0, [r6, 0x8] @@ -166330,7 +166330,7 @@ _080CC0A6: strb r0, [r1] ldrb r1, [r6, 0xE] adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r4, 0 bl sub_80786EC ldrh r0, [r6, 0x8] @@ -166389,7 +166389,7 @@ _080CC11C: strb r1, [r0] ldrb r1, [r6, 0xE] adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r4, 0 bl sub_80786EC ldrh r0, [r6, 0x8] @@ -166443,7 +166443,7 @@ _080CC1B4: strb r1, [r0] ldrb r1, [r6, 0xE] adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r4, 0 bl sub_80786EC ldrh r0, [r6, 0x8] @@ -166500,7 +166500,7 @@ _080CC206: strb r0, [r1] ldrb r1, [r6, 0xE] adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r4, 0 bl sub_80786EC ldrh r0, [r6, 0x8] @@ -166552,7 +166552,7 @@ _080CC298: strb r1, [r0] ldrb r1, [r6, 0xE] adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r4, 0 bl sub_80786EC ldrh r0, [r6, 0x8] @@ -166568,7 +166568,7 @@ _080CC2EA: cmp r0, 0 beq _080CC330 adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldrh r0, [r6, 0x8] adds r0, 0x1 b _080CC32E @@ -166655,7 +166655,7 @@ sub_80CC358: @ 80CC358 lsls r2, 16 asrs r2, 16 ldrb r3, [r6, 0x10] - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -166685,7 +166685,7 @@ sub_80CC358: @ 80CC358 strh r0, [r1, 0x22] ldrb r1, [r6, 0xE] adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldrh r0, [r6, 0x10] adds r4, 0x43 strb r0, [r4] @@ -166756,7 +166756,7 @@ sub_80CC408: @ 80CC408 subs r0, 0x1 strh r0, [r1] adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080CC46A: pop {r4} pop {r0} @@ -166987,7 +166987,7 @@ sub_80CC5F8: @ 80CC5F8 _080CC618: .4byte 0x03004b20 _080CC61C: ldr r0, _080CC648 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 20 movs r2, 0x80 @@ -166996,7 +166996,7 @@ _080CC61C: adds r0, r4 strh r0, [r5, 0x18] ldr r0, _080CC64C - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 20 adds r0, r4 @@ -167312,7 +167312,7 @@ sub_80CC884: @ 80CC884 bne _080CC89E adds r0, r5, 0 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim _080CC89E: ldr r0, _080CC8C0 str r0, [r5, 0x1C] @@ -167357,7 +167357,7 @@ sub_80CC8C8: @ 80CC8C8 strh r0, [r4, 0x38] ldrb r1, [r1, 0xC] adds r0, r4, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim ldr r1, _080CC90C adds r0, r4, 0 bl oamt_set_x3A_32 @@ -167778,14 +167778,14 @@ _080CCC14: lsls r0, 2 ldr r4, _080CCC4C adds r0, r4 - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r0, 0x30 ldrsh r1, [r5, r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r4 - bl RemoveObjectAndFreeTiles + bl DestroySprite adds r0, r5, 0 bl move_anim_8072740 _080CCC44: @@ -167825,7 +167825,7 @@ _080CCC7E: ldr r4, _080CCCAC ldrb r1, [r4, 0xA] adds r0, r5, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldrh r0, [r4, 0x6] negs r0, r0 strh r0, [r5, 0x30] @@ -167982,7 +167982,7 @@ _080CCDB8: ldrh r0, [r0, 0x4] strh r0, [r5, 0x2E] ldr r0, _080CCDFC - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 20 movs r3, 0x80 @@ -168286,7 +168286,7 @@ _080CD004: strh r0, [r4, 0x30] adds r0, r4, 0 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim b _080CD0A8 _080CD020: adds r0, r4, 0 @@ -168630,7 +168630,7 @@ _080CD2A8: strh r0, [r4, 0x22] adds r0, r4, 0 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim _080CD2C2: ldr r0, _080CD2D0 str r0, [r4, 0x1C] @@ -168726,7 +168726,7 @@ _080CD360: strh r0, [r4, 0x34] adds r0, r4, 0 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim _080CD37E: ldr r0, _080CD390 str r0, [r4, 0x1C] @@ -170176,7 +170176,7 @@ sub_80CDE24: @ 80CDE24 strh r0, [r4, 0x22] adds r0, r4, 0 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim strh r6, [r4, 0x2E] strh r6, [r4, 0x30] ldr r0, _080CDE74 @@ -170995,7 +170995,7 @@ sub_80CE3EC: @ 80CE3EC mov r2, r8 bl sub_8079BF4 ldr r0, _080CE4C4 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 24 movs r4, 0x80 @@ -171006,7 +171006,7 @@ sub_80CE3EC: @ 80CE3EC orrs r0, r1 mov r10, r0 ldr r0, _080CE4C8 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 24 lsls r4, r0 @@ -171462,7 +171462,7 @@ sub_80CE7E0: @ 80CE7E0 lsrs r0, 24 strh r0, [r6, 0x8] ldr r0, _080CE874 - bl AllocObjectPalette + bl AllocSpritePalette lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0xA] @@ -171633,7 +171633,7 @@ _080CE956: orrs r1, r2 strh r1, [r0] ldr r0, _080CE970 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag adds r0, r4, 0 bl move_anim_task_del _080CE968: @@ -171746,7 +171746,7 @@ sub_80CEA20: @ 80CEA20 mov r9, r0 ldr r4, _080CEAD0 ldrh r0, [r4] - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0xFF @@ -171782,7 +171782,7 @@ _080CEA6A: mov r1, r8 adds r0, r5, r1 ldrh r0, [r0] - bl AllocObjectPalette + bl AllocSpritePalette lsls r0, 24 lsrs r3, r0, 24 adds r4, 0x1 @@ -171844,7 +171844,7 @@ _080CEAE2: lsls r0, 2 adds r0, r6 ldrh r0, [r0] - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -171868,7 +171868,7 @@ sub_80CEB0C: @ 80CEB0C ldr r4, _080CEB64 ldrb r1, [r4] adds r0, r5, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r2, _080CEB68 movs r0, 0x2 ldrsh r1, [r4, r0] @@ -171877,7 +171877,7 @@ sub_80CEB0C: @ 80CEB0C lsls r0, 2 adds r0, r2 ldrh r0, [r0] - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF @@ -172084,7 +172084,7 @@ _080CECB6: lsls r0, 2 adds r0, r2 ldrh r0, [r0] - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF @@ -172140,7 +172140,7 @@ _080CED06: strh r0, [r6, 0x22] ldrb r1, [r4] adds r0, r6, 0 - bl StartObjectImageAnim + bl StartSpriteAnim strh r5, [r6, 0x32] strh r5, [r6, 0x34] ldrh r0, [r6, 0x20] @@ -172301,7 +172301,7 @@ sub_80CEE60: @ 80CEE60 ldr r5, _080CEED8 ldrb r1, [r5, 0x2] adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r2, _080CEEDC movs r0, 0x4 ldrsh r1, [r5, r0] @@ -172310,7 +172310,7 @@ sub_80CEE60: @ 80CEE60 lsls r0, 2 adds r0, r2 ldrh r0, [r0] - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF @@ -172486,7 +172486,7 @@ _080CEFBA: adds r0, r1, 0x2 strh r0, [r5, 0x30] adds r0, r5, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r1, _080CF000 adds r0, r5, 0 bl oamt_set_x3A_32 @@ -172519,7 +172519,7 @@ sub_80CF008: @ 80CF008 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r0, _080CF03C str r0, [r4, 0x1C] _080CF030: @@ -172580,7 +172580,7 @@ sub_80CF088: @ 80CF088 ble _080CF0AE adds r0, r4, 0 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim ldr r1, _080CF0B4 adds r0, r4, 0 bl oamt_set_x3A_32 @@ -172769,7 +172769,7 @@ _080CF1E6: bne _080CF20C adds r0, r5, 0 movs r1, 0 - bl StartObjectImageAnim + bl StartSpriteAnim movs r0, 0x2 b _080CF216 .align 2, 0 @@ -172777,7 +172777,7 @@ _080CF208: .4byte 0x0202f7c9 _080CF20C: adds r0, r5, 0 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim movs r0, 0x3 _080CF216: strh r0, [r5, 0x2E] @@ -172807,7 +172807,7 @@ sub_80CF228: @ 80CF228 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r1, _080CF25C adds r0, r4, 0 bl oamt_set_x3A_32 @@ -173554,7 +173554,7 @@ sub_80CF7E0: @ 80CF7E0 subs r1, 0x1 strh r1, [r0, 0xA] adds r0, r3, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080CF80A: pop {r0} bx r0 @@ -173866,7 +173866,7 @@ sub_80CFA20: @ 80CFA20 subs r3, r4 lsls r3, 24 lsrs r3, 24 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 mov r12, r0 @@ -174324,7 +174324,7 @@ sub_80CFDFC: @ 80CFDFC bl sub_80787B0 ldr r0, _080CFE24 ldrh r0, [r0, 0x2] - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 20 movs r1, 0x80 @@ -174784,7 +174784,7 @@ sub_80D0178: @ 80D0178 movs r6, 0x10 adds r0, r5, 0 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim _080D01A4: lsls r0, r7, 16 asrs r0, 16 @@ -174875,7 +174875,7 @@ sub_80D0228: @ 80D0228 lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl StartObjectImageAnim + bl StartSpriteAnim _080D025C: mov r0, r8 lsls r1, r0, 16 @@ -174947,7 +174947,7 @@ sub_80D02D0: @ 80D02D0 beq _080D0334 adds r0, r4, 0 movs r1, 0 - bl SeekObjectImageAnim + bl SeekSpriteAnim adds r2, r4, 0 adds r2, 0x2C ldrb r0, [r2] @@ -175033,7 +175033,7 @@ _080D035C: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r0, _080D03A4 str r0, [r4, 0x1C] _080D039E: @@ -175373,7 +175373,7 @@ sub_80D0614: @ 80D0614 asrs r4, r0, 16 cmp r4, 0 blt _080D06EE - bl rotscale_alloc_entry + bl AllocOamMatrix lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0xFF @@ -175460,7 +175460,7 @@ _080D0658: lsls r3, 30 lsrs r3, 30 adds r0, r4, 0 - bl CalcVecFromObjectCenterToObjectUpperLeft + bl CalcCenterToCornerVec _080D06EE: pop {r3,r4} mov r8, r3 @@ -175501,7 +175501,7 @@ sub_80D0704: @ 80D0704 ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix adds r0, r4, 0 bl obj_delete_but_dont_free_vram _080D0742: @@ -175771,7 +175771,7 @@ sub_80D0930: @ 80D0930 bne _080D0964 adds r0, r4, 0 movs r1, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldrb r0, [r5] movs r1, 0x2 bl sub_8077ABC @@ -175786,7 +175786,7 @@ _080D0960: .4byte 0x0202f7c8 _080D0964: adds r0, r4, 0 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim ldrb r0, [r5] movs r1, 0x2 bl sub_8077ABC @@ -176739,7 +176739,7 @@ sub_80D1098: @ 80D1098 cmp r0, 0 beq _080D10B2 adds r0, r4, 0 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix adds r0, r4, 0 bl move_anim_8072740 _080D10B2: @@ -177043,7 +177043,7 @@ sub_80D1318: @ 80D1318 push {r4,lr} adds r4, r0, 0 ldr r0, _080D1358 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF @@ -177060,7 +177060,7 @@ sub_80D1318: @ 80D1318 _080D133E: adds r0, r4, 0 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim ldr r1, _080D1364 str r1, [r4, 0x1C] adds r0, r4, 0 @@ -177157,7 +177157,7 @@ _080D13DC: strh r5, [r4, 0x2E] adds r0, r4, 0 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim ldr r0, _080D1420 str r0, [r4, 0x1C] _080D1410: @@ -177183,7 +177183,7 @@ sub_80D1424: @ 80D1424 ble _080D1442 adds r0, r4, 0 movs r1, 0x2 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim ldr r0, _080D1448 str r0, [r4, 0x1C] _080D1442: @@ -177206,7 +177206,7 @@ sub_80D144C: @ 80D144C beq _080D14B2 adds r0, r4, 0 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim movs r0, 0 strh r0, [r4, 0x2E] movs r1, 0x3C @@ -177951,7 +177951,7 @@ _080D19C6: movs r3, 0x26 ldrsh r2, [r4, r3] movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 @@ -178070,7 +178070,7 @@ sub_80D1A70: @ 80D1A70 subs r0, 0x1 strh r0, [r1] adds r0, r3, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080D1AD2: pop {r4} pop {r0} @@ -178086,7 +178086,7 @@ sub_80D1ADC: @ 80D1ADC lsls r0, 24 lsrs r6, r0, 24 ldr r0, _080D1B34 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag mov r1, sp strb r0, [r1] movs r5, 0x1 @@ -178096,7 +178096,7 @@ _080D1AF4: subs r0, r4, r5 lsls r0, 16 lsrs r0, 16 - bl AllocObjectPalette + bl AllocSpritePalette mov r2, sp adds r1, r2, r5 strb r0, [r1] @@ -178167,7 +178167,7 @@ sub_80D1B80: @ 80D1B80 movs r4, 0x4 _080D1B8A: ldrh r0, [r5] - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag adds r5, 0x2 subs r4, 0x1 cmp r4, 0 @@ -178213,7 +178213,7 @@ sub_80D1BA8: @ 80D1BA8 lsls r2, 1 adds r2, r0 ldrh r0, [r2] - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 4 ldrb r2, [r5, 0x5] movs r1, 0xF @@ -178456,7 +178456,7 @@ sub_80D1D9C: @ 80D1D9C adds r0, 0x1E ldr r1, _080D1DF0 movs r2, 0x2 - bl AddTilesToObjectCopyRequests + bl RequestSpriteCopy str r4, [sp] str r4, [sp, 0x4] str r4, [sp, 0x8] @@ -180120,7 +180120,7 @@ sub_80D2ABC: @ 80D2ABC strh r0, [r4, 0x22] adds r0, r4, 0 movs r1, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r0, _080D2BBC ldrb r0, [r0] bl sub_8079E90 @@ -180275,7 +180275,7 @@ sub_80D2BE8: @ 80D2BE8 strh r0, [r4, 0x22] ldrb r1, [r1, 0x4] adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] @@ -180360,7 +180360,7 @@ _080D2CA0: lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r0, _080D2CC0 str r0, [r5, 0x1C] _080D2CB8: @@ -180391,7 +180391,7 @@ sub_80D2CC4: @ 80D2CC4 lsls r1, 24 lsrs r1, 24 adds r0, r2, 0 - bl StartObjectImageAnim + bl StartSpriteAnim b _080D2CF4 _080D2CEE: adds r0, r2, 0 @@ -180660,7 +180660,7 @@ sub_80D2EC8: @ 80D2EC8 strh r0, [r6, 0x22] ldrb r1, [r4, 0x2] adds r0, r6, 0 - bl StartObjectImageAnim + bl StartSpriteAnim strh r5, [r6, 0x38] ldrh r0, [r4, 0x4] strh r0, [r6, 0x34] @@ -180721,7 +180721,7 @@ _080D2EF6: strh r5, [r6, 0x34] adds r0, r6, 0 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim _080D2F72: pop {r4-r6} pop {r0} @@ -180844,7 +180844,7 @@ sub_80D3014: @ 80D3014 strh r0, [r5, 0x22] adds r0, r5, 0 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim b _080D3080 .align 2, 0 _080D3058: .4byte 0x020239f8 @@ -180976,7 +180976,7 @@ _080D3118: ldr r0, _080D3180 adds r1, r4, 0 movs r3, 0x4 - bl AddObjectToFront + bl CreateSprite _080D3160: movs r0, 0x8 ldrsh r1, [r5, r0] @@ -181031,7 +181031,7 @@ _080D31AE: cmp r0, 0 beq _080D31C2 adds r0, r2, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080D31C2: pop {r0} bx r0 @@ -181164,7 +181164,7 @@ _080D3240: _080D32D0: .4byte 0x03004b00 _080D32D4: .4byte 0x0202f7c8 _080D32D8: .4byte 0x0202f7c9 -_080D32DC: .4byte nullsub_2 +_080D32DC: .4byte SpriteCallbackDummy _080D32E0: .4byte 0x02020004 _080D32E4: .4byte sub_80D32E8 thumb_func_end sub_80D31C8 @@ -181226,7 +181226,7 @@ _080D3354: ldr r0, _080D336C str r0, [r5, 0x1C] adds r0, r7, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080D335E: add sp, 0x4 pop {r3} @@ -181357,7 +181357,7 @@ sub_80D344C: @ 80D344C bne _080D346E adds r0, r4, 0 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim adds r2, r4, 0 adds r2, 0x2C ldrb r1, [r2] @@ -181395,7 +181395,7 @@ sub_80D3490: @ 80D3490 ldrh r0, [r0] strh r0, [r4, 0x8] ldr r0, _080D34CC - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 20 movs r1, 0x80 @@ -183439,7 +183439,7 @@ _080D4482: mov r1, r10 mov r2, r9 ldr r3, [sp, 0x8] - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r2, r0, 24 lsls r6, r5, 16 @@ -183600,7 +183600,7 @@ _080D45AA: subs r0, 0x1 strh r0, [r1] adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080D45CE: pop {r4} pop {r0} @@ -183808,7 +183808,7 @@ sub_80D472C: @ 80D472C ldrsh r1, [r4, r2] movs r2, 0 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -183895,7 +183895,7 @@ sub_80D47D0: @ 80D47D0 movs r3, 0x22 ldrsh r2, [r5, r3] movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x30] @@ -183909,7 +183909,7 @@ sub_80D47D0: @ 80D47D0 ldr r4, _080D4874 adds r0, r4 movs r1, 0x3 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim movs r2, 0x30 ldrsh r1, [r5, r2] lsls r0, r1, 4 @@ -183937,7 +183937,7 @@ sub_80D47D0: @ 80D47D0 str r1, [r0] _080D4860: adds r0, r5, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080D4866: pop {r4,r5} pop {r0} @@ -184000,9 +184000,9 @@ sub_80D487C: @ 80D487C ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080D48E8: pop {r4} pop {r0} @@ -184268,7 +184268,7 @@ sub_80D4AD0: @ 80D4AD0 movs r3, 0x10 ldrsh r2, [r6, r3] movs r3, 0xA - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -184380,7 +184380,7 @@ _080D4BB6: subs r0, 0x1 strh r0, [r2, 0x18] adds r0, r5, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080D4BD6: adds r0, r4, 0x1 lsls r0, 16 @@ -184483,9 +184483,9 @@ sub_80D4C64: @ 80D4C64 cmp r0, 0 bne _080D4C9C adds r0, r4, 0 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080D4C9C: pop {r4} pop {r0} @@ -184664,7 +184664,7 @@ _080D4DF2: mov r3, r10 asrs r2, r3, 16 movs r3, 0x82 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r2, r0, 24 ldr r1, _080D4E38 @@ -184722,7 +184722,7 @@ _080D4E68: mov r3, r10 asrs r2, r3, 16 movs r3, 0x82 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r2, r0, 24 ldr r1, _080D4EB0 @@ -186007,7 +186007,7 @@ _080D5844: ldr r3, [sp, 0x4] asrs r2, r3, 16 movs r3, 0x2 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 @@ -186117,7 +186117,7 @@ sub_80D58FC: @ 80D58FC subs r0, 0x1 strh r0, [r1] adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080D5936: pop {r4} pop {r0} @@ -186405,7 +186405,7 @@ _080D5B28: ldr r4, _080D5B50 ldrb r1, [r4, 0x4] adds r0, r5, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldrh r0, [r4, 0x4] strh r0, [r5, 0x3C] ldr r0, _080D5B54 @@ -188268,7 +188268,7 @@ _080D6992: lsls r2, 16 asrs r2, 16 movs r3, 0x2 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r5, r0, 24 adds r0, r7, 0x1 @@ -188371,7 +188371,7 @@ _080D6A52: cmp r0, 0xF bne _080D6A66 adds r0, r3, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080D6A66: pop {r0} bx r0 @@ -188399,7 +188399,7 @@ sub_80D6A6C: @ 80D6A6C adds r3, r4, 0 adds r3, 0x43 ldrb r3, [r3] - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r3, _080D6ADC @@ -188575,7 +188575,7 @@ sub_80D6BB8: @ 80D6BB8 movs r3, 0x26 ldrsh r2, [r5, r3] movs r3, 0x2 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -188699,7 +188699,7 @@ sub_80D6CCC: @ 80D6CCC subs r1, 0x1 strh r1, [r0, 0x16] adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080D6CF4: pop {r4} pop {r0} @@ -188713,7 +188713,7 @@ sub_80D6D00: @ 80D6D00 push {r4,lr} adds r4, r0, 0 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r0, _080D6D14 str r0, [r4, 0x1C] pop {r4} @@ -188820,7 +188820,7 @@ sub_80D6DD8: @ 80D6DD8 push {r4,r5,lr} adds r5, r0, 0 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim ldr r4, _080D6E30 ldrb r0, [r4] movs r1, 0x2 @@ -189321,7 +189321,7 @@ sub_80D7194: @ 80D7194 movs r3, 0x12 ldrsh r2, [r4, r3] movs r3, 0x23 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 @@ -189425,9 +189425,9 @@ sub_80D7230: @ 80D7230 ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080D7270: pop {r4} pop {r0} @@ -189463,7 +189463,7 @@ _080D728E: strh r0, [r5, 0x22] adds r0, r5, 0 movs r1, 0x2 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim ldrh r0, [r5, 0x2E] adds r0, 0x1 strh r0, [r5, 0x2E] @@ -189703,7 +189703,7 @@ sub_80D7470: @ 80D7470 movs r3, 0x16 ldrsh r2, [r4, r3] movs r3, 0x23 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 @@ -189841,7 +189841,7 @@ sub_80D755C: @ 80D755C subs r0, 0x1 strh r0, [r1] adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080D7592: pop {r4} pop {r0} @@ -189962,7 +189962,7 @@ sub_80D7654: @ 80D7654 ldrh r3, [r4, 0x20] lsls r3, 24 lsrs r3, 24 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -190034,7 +190034,7 @@ sub_80D76C4: @ 80D76C4 subs r0, 0x1 strh r0, [r1] adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080D76F8: pop {r4} pop {r0} @@ -192534,7 +192534,7 @@ _080D8A94: ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix ldrb r1, [r4, 0x1] movs r0, 0x4 negs r0, r0 @@ -192542,7 +192542,7 @@ _080D8A94: strb r0, [r4, 0x1] _080D8AC2: adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r1, _080D8AD8 ldrb r0, [r1] subs r0, 0x1 @@ -192807,7 +192807,7 @@ _080D8CA6: movs r2, 0x8 negs r2, r2 movs r3, 0x12 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x40 @@ -192819,7 +192819,7 @@ _080D8CA6: adds r4, r0 adds r0, r4, 0 mov r1, r9 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim mov r0, sp ldrh r0, [r0, 0x4] strh r0, [r4, 0x2E] @@ -192890,7 +192890,7 @@ _080D8D46: adds r3, r4, 0 adds r3, 0x43 ldrb r3, [r3] - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x2E] @@ -192927,9 +192927,9 @@ _080D8DAA: ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite b _080D8DF6 .align 2, 0 _080D8DBC: .4byte gUnknown_083D9C78 @@ -192954,9 +192954,9 @@ _080D8DC8: ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080D8DF6: pop {r4} pop {r0} @@ -192994,9 +192994,9 @@ sub_80D8E00: @ 80D8E00 ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080D8E40: pop {r4} pop {r0} @@ -193024,7 +193024,7 @@ unc_080B06FC: @ 80D8E4C movs r1, 0x4 _080D8E6A: adds r0, r5, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim adds r0, r5, 0 movs r1, 0x1 bl sub_80787B0 @@ -193085,7 +193085,7 @@ sub_80D8EE0: @ 80D8EE0 beq _080D8F02 adds r0, r4, 0 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r0, _080D8F08 str r0, [r4, 0x1C] ldr r1, _080D8F0C @@ -193273,7 +193273,7 @@ _080D9054: ldr r4, _080D9070 ldrb r1, [r4, 0xC] adds r0, r5, 0 - bl StartObjectImageAnim + bl StartSpriteAnim movs r0, 0 strh r0, [r4, 0xC] adds r0, r5, 0 @@ -193317,7 +193317,7 @@ sub_80D90A4: @ 80D90A4 adds r5, r0, 0 ldr r4, _080D90C4 ldrb r1, [r4, 0x8] - bl StartObjectImageAnim + bl StartSpriteAnim movs r1, 0x6 ldrsh r0, [r4, r1] cmp r0, 0 @@ -193387,7 +193387,7 @@ _080D911A: _080D9138: ldrb r1, [r4, 0x4] adds r0, r5, 0 - bl StartObjectImageAnim + bl StartSpriteAnim mov r0, r8 movs r1, 0x2 bl sub_8077ABC @@ -193492,7 +193492,7 @@ _080D91EC: adds r3, 0x1 lsls r3, 24 lsrs r3, 24 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x3C] @@ -193506,7 +193506,7 @@ _080D91EC: ldr r4, _080D9270 adds r0, r4 movs r1, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim movs r2, 0x3C ldrsh r1, [r5, r2] lsls r0, r1, 4 @@ -193531,7 +193531,7 @@ _080D9264: .4byte 0x02024a72 _080D9268: .4byte 0xfff00000 _080D926C: .4byte gUnknown_083DB4A8 _080D9270: .4byte 0x02020004 -_080D9274: .4byte nullsub_2 +_080D9274: .4byte SpriteCallbackDummy _080D9278: .4byte sub_80D927C thumb_func_end sub_80D90F4 @@ -193557,14 +193557,14 @@ sub_80D927C: @ 80D927C ldrb r0, [r0, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix movs r0, 0x3C ldrsh r1, [r5, r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r4 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080D92B8: adds r0, r5, 0 bl move_anim_8072740 @@ -193777,7 +193777,7 @@ sub_80D943C: @ 80D943C ldr r5, _080D9468 ldrb r1, [r5, 0x4] adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldrh r0, [r5, 0x6] strh r0, [r4, 0x2E] ldr r0, _080D946C @@ -193799,7 +193799,7 @@ sub_80D9474: @ 80D9474 push {r4,lr} adds r4, r0, 0 movs r1, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim adds r2, r4, 0 adds r2, 0x2C ldrb r0, [r2] @@ -194733,7 +194733,7 @@ _080D9BA6: lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldrh r0, [r5, 0x32] strh r0, [r5, 0x24] ldrh r0, [r5, 0x34] @@ -194776,7 +194776,7 @@ _080D9BF8: beq _080D9C0C adds r0, r4, 0 movs r1, 0x2 - bl StartObjectImageAnim + bl StartSpriteAnim b _080D9C22 _080D9C0C: ldr r0, _080D9C34 @@ -194787,7 +194787,7 @@ _080D9C0C: beq _080D9C22 adds r0, r4, 0 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim _080D9C22: ldr r0, _080D9C38 str r0, [r4, 0x1C] @@ -194969,7 +194969,7 @@ sub_80D9D70: @ 80D9D70 bne _080D9D86 adds r0, r5, 0 movs r1, 0x2 - bl StartObjectImageAnim + bl StartSpriteAnim _080D9D86: adds r0, r5, 0 movs r1, 0x1 @@ -195033,7 +195033,7 @@ sub_80D9DF0: @ 80D9DF0 bne _080D9E08 adds r0, r4, 0 movs r1, 0x2 - bl StartObjectImageAnim + bl StartSpriteAnim _080D9E08: adds r0, r4, 0 movs r1, 0x1 @@ -195384,7 +195384,7 @@ sub_80DA09C: @ 80DA09C ldrh r0, [r1] strh r0, [r4, 0xA] ldr r0, _080DA0D4 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0xC] @@ -195654,7 +195654,7 @@ _080DA2C2: bl oamt_set_x3A_32 ldrb r1, [r4, 0xA] adds r0, r5, 0 - bl SeekObjectImageAnim + bl SeekSpriteAnim pop {r4,r5} pop {r0} bx r0 @@ -195757,7 +195757,7 @@ sub_80DA38C: @ 80DA38C strh r0, [r5, 0x22] adds r0, r5, 0 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim b _080DA3C2 .align 2, 0 _080DA3B4: .4byte 0x0202f7c8 @@ -195886,7 +195886,7 @@ sub_80DA48C: @ 80DA48C ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix ldrb r1, [r4, 0x1] movs r0, 0x4 negs r0, r0 @@ -195894,7 +195894,7 @@ sub_80DA48C: @ 80DA48C strb r0, [r4, 0x1] _080DA4BE: adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r1, _080DA4D4 ldrb r0, [r1] subs r0, 0x1 @@ -197430,7 +197430,7 @@ _080DB058: ldr r4, _080DB08C ldrb r1, [r4, 0x8] adds r0, r5, 0 - bl SeekObjectImageAnim + bl SeekSpriteAnim ldrh r0, [r5, 0x20] subs r0, 0x20 strh r0, [r5, 0x20] @@ -197481,7 +197481,7 @@ sub_80DB0A0: @ 80DB0A0 strh r1, [r4, 0x2E] strh r1, [r4, 0x24] adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim _080DB0CA: ldrh r0, [r4, 0x3C] subs r0, 0x1 @@ -197557,7 +197557,7 @@ sub_80DB0E8: @ 80DB0E8 mov r0, r8 adds r1, r4, 0 movs r3, 0x3 - bl AddObjectAndAnimateForOneFrame + bl CreateSpriteAndAnimate _080DB162: ldrh r0, [r7, 0x8] adds r0, 0x8 @@ -198492,7 +198492,7 @@ _080DB84A: _080DB85C: ldr r0, _080DB884 ldrh r0, [r0, 0x4] - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 20 movs r1, 0x80 @@ -198852,7 +198852,7 @@ sub_80DBAF4: @ 80DBAF4 beq _080DBB44 adds r0, r5, 0 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim ldrh r0, [r5, 0x20] subs r0, 0x28 strh r0, [r5, 0x20] @@ -198973,7 +198973,7 @@ sub_80DBC00: @ 80DBC00 movs r0, 0 strh r0, [r4, 0x2E] adds r0, r4, 0 - bl obj_alloc_rotscale_entry + bl InitSpriteAffineAnim ldr r0, _080DBC30 str r0, [r4, 0x1C] pop {r4} @@ -199006,7 +199006,7 @@ _080DBC46: ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix ldrb r1, [r4, 0x1] movs r0, 0x4 negs r0, r0 @@ -199341,7 +199341,7 @@ _080DBEDE: movs r3, 0x24 ldrsh r2, [r4, r3] movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r2, r0, 24 movs r0, 0xC @@ -199475,7 +199475,7 @@ _080DBFCE: lsls r0, 2 ldr r1, _080DC000 adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080DBFEA: adds r0, r5, 0x1 lsls r0, 16 @@ -199764,7 +199764,7 @@ _080DC220: movs r3, 0x20 ldrsh r2, [r5, r3] movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -199788,7 +199788,7 @@ _080DC220: movs r1, 0x3 ands r1, r0 adds r0, r4, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim _080DC274: ldrh r0, [r5, 0xC] adds r0, 0x1 @@ -199831,9 +199831,9 @@ sub_80DC2B0: @ 80DC2B0 ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080DC2CE: pop {r4} pop {r0} @@ -200142,7 +200142,7 @@ sub_80DC4F4: @ 80DC4F4 lsls r0, 3 ldr r1, _080DC528 adds r7, r0, r1 - bl rotscale_alloc_entry + bl AllocOamMatrix lsls r0, 24 lsrs r5, r0, 24 mov r10, r5 @@ -200165,7 +200165,7 @@ _080DC52C: cmp r0, 0 bge _080DC554 adds r0, r5, 0 - bl rotscale_free_entry + bl FreeOamMatrix mov r0, r8 bl move_anim_task_del b _080DC5D6 @@ -200221,7 +200221,7 @@ _080DC554: lsls r3, 30 lsrs r3, 30 adds r0, r4, 0 - bl CalcVecFromObjectCenterToObjectUpperLeft + bl CalcCenterToCornerVec ldr r1, _080DC5EC ldrb r0, [r1] bl obj_id_for_side_relative_to_move @@ -200244,7 +200244,7 @@ _080DC5D6: bx r0 .align 2, 0 _080DC5E4: .4byte 0x02020004 -_080DC5E8: .4byte nullsub_2 +_080DC5E8: .4byte SpriteCallbackDummy _080DC5EC: .4byte 0x03004b00 _080DC5F0: .4byte sub_80DC5F4 thumb_func_end sub_80DC4F4 @@ -200374,7 +200374,7 @@ _080DC6E8: ldrh r0, [r4, 0x24] lsls r0, 24 lsrs r0, 24 - bl rotscale_free_entry + bl FreeOamMatrix adds r0, r5, 0 bl move_anim_task_del _080DC6F8: @@ -200461,7 +200461,7 @@ _080DC778: bl audio_play_and_stuff adds r0, r5, 0 movs r1, 0x1 - bl sub_8002068 + bl ChangeSpriteAffineAnim _080DC7A2: ldrh r0, [r5, 0x2E] adds r0, 0x1 @@ -200542,7 +200542,7 @@ sub_80DC824: @ 80DC824 beq _080DC850 adds r0, r6, 0 movs r1, 0x2 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim ldr r0, _080DC84C ldrh r1, [r0, 0x4] negs r1, r1 @@ -200562,7 +200562,7 @@ _080DC850: bne _080DC880 adds r0, r6, 0 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim ldr r1, _080DC8E8 ldrh r0, [r1, 0x2] negs r0, r0 @@ -200642,7 +200642,7 @@ sub_80DC8F4: @ 80DC8F4 strh r0, [r1] adds r0, r6, 0 movs r1, 0x2 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim b _080DC934 .align 2, 0 _080DC914: .4byte 0x03004b00 @@ -201375,9 +201375,9 @@ _080DCEBC: strh r0, [r5, 0x22] ldrb r1, [r6, 0x2] adds r0, r5, 0 - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r5, 0 - bl AnimateObject + bl AnimateSprite strh r4, [r5, 0x2E] strh r4, [r5, 0x30] movs r0, 0x4 @@ -201445,9 +201445,9 @@ sub_80DCF60: @ 80DCF60 adds r5, r0, 0 ldr r4, _080DCF88 ldrb r1, [r4, 0xA] - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r5, 0 - bl AnimateObject + bl AnimateSprite ldr r0, _080DCF8C ldrb r0, [r0] bl battle_side_get_owner @@ -202019,7 +202019,7 @@ _080DD3FC: strh r0, [r5, 0x22] ldr r1, _080DD424 adds r0, r5, 0 - bl SetSpriteOamTables_NoPriorityFromTable + bl SetSubspriteTables ldrh r0, [r4, 0x2] strh r0, [r5, 0x30] ldrh r0, [r4, 0x4] @@ -202095,7 +202095,7 @@ sub_80DD490: @ 80DD490 adds r4, r0, 0 ldr r5, _080DD4C8 ldrb r1, [r5, 0x8] - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r4, 0 movs r1, 0 bl sub_80787B0 @@ -202522,7 +202522,7 @@ _080DD7D0: asrs r2, 16 adds r0, r3, 0 movs r3, 0x23 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 @@ -202610,7 +202610,7 @@ sub_80DD87C: @ 80DD87C strh r0, [r1, 0x1E] _080DD8A8: adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080DD8AE: pop {r4} pop {r0} @@ -202653,7 +202653,7 @@ sub_80DD8E8: @ 80DD8E8 adds r4, r0, 0 ldr r5, _080DD920 ldrb r1, [r5, 0x8] - bl StartObjectImageAnim + bl StartSpriteAnim ldrh r0, [r5] strh r0, [r4, 0x24] ldrh r0, [r5, 0x2] @@ -202738,7 +202738,7 @@ sub_80DD978: @ 80DD978 bne _080DD994 adds r0, r4, 0 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim _080DD994: adds r0, r4, 0 bl sub_807941C @@ -202779,7 +202779,7 @@ sub_80DD9A4: @ 80DD9A4 strh r0, [r4, 0x38] ldrb r1, [r2, 0x6] adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r0, _080DD9F8 str r0, [r4, 0x1C] pop {r4,r5} @@ -203947,7 +203947,7 @@ _080DE2C0: .align 2, 0 _080DE2C8: .4byte 0x0000ff90 _080DE2CC: .4byte 0x02020004 -_080DE2D0: .4byte nullsub_2 +_080DE2D0: .4byte SpriteCallbackDummy _080DE2D4: .4byte sub_8078394 _080DE2D8: .4byte sub_80DE2DC thumb_func_end sub_80DE1B0 @@ -204128,7 +204128,7 @@ _080DE418: _080DE42C: ldr r7, _080DE460 adds r0, r7, 0 - bl AllocObjectPalette + bl AllocSpritePalette lsls r0, 24 lsrs r0, 24 movs r2, 0 @@ -204143,7 +204143,7 @@ _080DE42C: cmp r0, 0 bge _080DE464 adds r0, r7, 0 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag _080DE456: adds r0, r4, 0 bl move_anim_task_del @@ -204539,7 +204539,7 @@ _080DE740: adds r0, r3 bl obj_delete_but_dont_free_vram ldr r0, _080DE78C - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag ldr r0, _080DE790 movs r1, 0 strh r1, [r0] @@ -204833,7 +204833,7 @@ _080DE98A: adds r1, r6, 0 adds r2, r7, 0 movs r3, 0x37 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 mov r8, r0 @@ -204932,7 +204932,7 @@ _080DEA88: adds r1, r7, 0 ldr r2, [sp, 0xC] movs r3, 0x37 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 mov r8, r0 @@ -205168,7 +205168,7 @@ _080DEC4C: lsls r0, 2 ldr r1, _080DEC7C adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 @@ -205953,7 +205953,7 @@ _080DF292: ldrsh r2, [r4, r0] ldrb r3, [r4, 0x14] ldr r0, _080DF2F4 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 @@ -206213,7 +206213,7 @@ _080DF444: subs r0, 0x1 strh r0, [r1, 0x16] adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080DF492: pop {r4} pop {r0} @@ -206495,7 +206495,7 @@ _080DF6A0: strh r0, [r5, 0x36] adds r0, r5, 0 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim _080DF6CA: ldr r0, _080DF6E4 ldrh r0, [r0, 0x8] @@ -206579,7 +206579,7 @@ sub_80DF760: @ 80DF760 beq _080DF77A adds r0, r4, 0 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim _080DF77A: adds r0, r4, 0 bl sub_80DF63C @@ -207572,7 +207572,7 @@ sub_80DFF1C: @ 80DFF1C strh r0, [r4, 0x22] ldrb r1, [r5, 0x4] adds r0, r4, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim ldrh r0, [r5, 0x6] strh r0, [r4, 0x2E] ldrh r0, [r5, 0x8] @@ -207755,7 +207755,7 @@ _080E0094: strh r0, [r4, 0x22] adds r0, r4, 0 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim movs r6, 0xEC _080E00A0: movs r0, 0x20 @@ -208969,7 +208969,7 @@ sub_80E0A10: @ 80E0A10 strh r0, [r4, 0x22] ldrb r1, [r1, 0x4] adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r0, _080E0A44 str r0, [r4, 0x1C] ldr r1, _080E0A48 @@ -209371,7 +209371,7 @@ _080E0D84: adds r0, r1 lsls r0, 2 adds r0, r6 - bl RemoveObjectAndFreeTiles + bl DestroySprite mov r0, sp bl sub_8078914 ldr r2, [sp, 0x4] @@ -211376,7 +211376,7 @@ _080E1CF4: strh r1, [r4, 0x36] adds r0, r4, 0 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim _080E1D02: ldr r0, _080E1D18 ldrh r0, [r0, 0x8] @@ -211917,7 +211917,7 @@ sub_80E20E4: @ 80E20E4 lsls r4, 3 adds r4, r1 ldrh r0, [r4, 0x8] - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 24 adds r0, 0x10 @@ -212033,7 +212033,7 @@ sub_80E21A8: @ 80E21A8 ldrh r0, [r5] strh r0, [r4, 0x16] ldrh r0, [r5] - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 24 adds r0, 0x10 @@ -212098,7 +212098,7 @@ _080E2258: .4byte 0x0202f388 _080E225C: .4byte sub_80E22CC _080E2260: ldrh r0, [r4, 0x16] - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 24 adds r0, 0x10 @@ -212173,7 +212173,7 @@ sub_80E22CC: @ 80E22CC lsls r0, 3 adds r0, r1 ldrh r0, [r0, 0x16] - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 24 adds r0, 0x10 @@ -212334,7 +212334,7 @@ _080E240C: adds r0, r2 ldr r0, [r0] ldrh r0, [r0, 0x2] - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 24 adds r1, r6, 0 @@ -212796,7 +212796,7 @@ sub_80E27A0: @ 80E27A0 adds r5, r0, 0 ldr r4, _080E27C0 ldrb r1, [r4, 0x6] - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim movs r1, 0x4 ldrsh r0, [r4, r1] cmp r0, 0 @@ -212831,7 +212831,7 @@ sub_80E27E8: @ 80E27E8 adds r5, r0, 0 ldr r4, _080E2808 ldrb r1, [r4, 0x6] - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim movs r1, 0x4 ldrsh r0, [r4, r1] cmp r0, 0 @@ -212911,7 +212911,7 @@ sub_80E2870: @ 80E2870 _080E288C: ldrb r1, [r5, 0x2] adds r0, r4, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim movs r1, 0 ldrsh r0, [r5, r1] cmp r0, 0 @@ -212999,7 +212999,7 @@ sub_80E2908: @ 80E2908 strh r0, [r4, 0x26] ldrb r1, [r5, 0x6] adds r0, r4, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim ldr r1, _080E2970 adds r0, r4, 0 bl oamt_set_x3A_32 @@ -213058,7 +213058,7 @@ sub_80E29C0: @ 80E29C0 adds r5, r0, 0 ldr r4, _080E29E0 ldrb r1, [r4, 0x6] - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim movs r1, 0x4 ldrsh r0, [r4, r1] cmp r0, 0 @@ -213393,7 +213393,7 @@ sub_80E2C60: @ 80E2C60 lsrs r4, 24 ldr r0, _080E2C88 ldrh r0, [r0] - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 24 adds r0, 0x10 @@ -214125,7 +214125,7 @@ _080E3208: adds r0, r1 lsls r0, 2 add r0, r8 - bl RemoveObjectAndFreeTiles + bl DestroySprite mov r0, sp bl sub_8078914 ldr r2, [sp, 0x4] @@ -214855,7 +214855,7 @@ _080E37E8: lsls r0, 2 ldr r5, _080E3888 adds r0, r5 - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r1, 0xC ldrsh r0, [r4, r1] cmp r0, 0 @@ -214866,7 +214866,7 @@ _080E37E8: adds r0, r1 lsls r0, 2 adds r0, r5 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080E3828: movs r3, 0x14 ldrsh r0, [r4, r3] @@ -215836,7 +215836,7 @@ _080E3F90: lsls r0, 2 ldr r5, _080E4004 adds r0, r5 - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r1, 0xC ldrsh r0, [r4, r1] cmp r0, 0 @@ -215847,7 +215847,7 @@ _080E3F90: adds r0, r1 lsls r0, 2 adds r0, r5 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080E3FD0: ldr r2, _080E3FFC ldrb r1, [r2, 0x1] @@ -220515,7 +220515,7 @@ _080E6344: movs r0, 0 bl SetVBlankCallback bl sub_8073B94 - bl ResetAllObjectData + bl ResetSpriteData bl dp12_8087EA4 bl remove_some_task bl sub_80EAD08 @@ -220524,8 +220524,8 @@ _080E6344: ldr r1, [r2, 0x4] ldr r2, [r2, 0x8] bl sub_80895F8 - bl FreeAllObjectTiles - bl ResetObjectPaletteAllocator + bl FreeAllSpriteTiles + bl FreeAllSpritePalettes b _080E6402 .align 2, 0 _080E637C: .4byte gUnknown_083DB698 @@ -221427,8 +221427,8 @@ _080E6A66: thumb_func_start sub_80E6A6C sub_80E6A6C: @ 80E6A6C push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl sub_80EAC5C bl copy_pal_bg_faded_to_pal_ram bl sub_8089668 @@ -221442,8 +221442,8 @@ sub_80E6A88: @ 80E6A88 ldr r0, _080E6AA4 ldr r0, [r0, 0x20] bl _call_via_r0 - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl sub_80EAD08 pop {r0} bx r0 @@ -224540,9 +224540,9 @@ sub_80E8218: @ 80E8218 ldm r0!, {r2,r3,r5} stm r1!, {r2,r3,r5} mov r0, sp - bl LoadObjectPics + bl LoadSpriteSheets adds r0, r4, 0 - bl LoadTaggedObjectPalettes + bl LoadSpritePalettes bl sub_80E8268 bl sub_80E8818 bl sub_80E8A7C @@ -224562,7 +224562,7 @@ sub_80E8268: @ 80E8268 movs r1, 0 movs r2, 0 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r2, _080E82B4 @@ -224805,7 +224805,7 @@ sub_80E8420: @ 80E8420 movs r1, 0 movs r2, 0 movs r3, 0x3 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r1, _080E84E4 @@ -224826,7 +224826,7 @@ sub_80E8420: @ 80E8420 movs r1, 0 movs r2, 0 movs r3, 0x4 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 adds r6, r7, 0 @@ -224844,7 +224844,7 @@ sub_80E8420: @ 80E8420 movs r1, 0 movs r2, 0 movs r3, 0x5 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 adds r2, r7, 0 @@ -224862,7 +224862,7 @@ sub_80E8420: @ 80E8420 ldr r0, [r2] strh r1, [r0, 0x2E] movs r0, 0x1 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag ldr r1, [r5] lsls r0, 24 lsrs r0, 20 @@ -224903,15 +224903,15 @@ sub_80E8504: @ 80E8504 adds r0, r4, 0 adds r0, 0x9C ldr r0, [r0] - bl RemoveObjectAndFreeTiles + bl DestroySprite adds r0, r4, 0 adds r0, 0xA0 ldr r0, [r0] - bl RemoveObjectAndFreeTiles + bl DestroySprite adds r0, r4, 0 adds r0, 0xA4 ldr r0, [r0] - bl RemoveObjectAndFreeTiles + bl DestroySprite pop {r4} pop {r0} bx r0 @@ -224994,13 +224994,13 @@ _080E859C: strh r0, [r1, 0x32] ldr r0, [r4] ldrb r1, [r7] - bl StartObjectImageAnim + bl StartSpriteAnim ldr r0, [r5] ldrb r1, [r7] - bl StartObjectImageAnim + bl StartSpriteAnim ldr r0, [r6] ldrb r1, [r7] - bl StartObjectImageAnim + bl StartSpriteAnim ldr r0, [r4] movs r1, 0x8 strh r1, [r0, 0x38] @@ -225326,7 +225326,7 @@ sub_80E8818: @ 80E8818 movs r1, 0 movs r2, 0 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r2, _080E8854 @@ -225601,7 +225601,7 @@ _080E8A20: strh r5, [r0, 0x30] ldr r0, [r2] adds r1, r7, 0 - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -225649,7 +225649,7 @@ _080E8A8E: mov r0, sp movs r1, 0 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r1, r0, 24 ldr r0, _080E8B6C @@ -225701,7 +225701,7 @@ _080E8AF6: mov r0, sp movs r2, 0x58 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r1, r0, 24 ldr r0, _080E8B6C @@ -225730,7 +225730,7 @@ _080E8AF6: ldr r0, [r2] lsls r1, r5, 24 lsrs r1, 24 - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 @@ -225865,12 +225865,12 @@ _080E8C42: add r0, sp, 0x4 bl LoadCompressedObjectPic add r0, sp, 0xC - bl LoadTaggedObjectPalette + bl LoadSpritePalette ldr r0, _080E8CDC adds r1, r4, 0 adds r2, r5, 0 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite ldr r0, _080E8CE0 ldrb r0, [r0, 0x8] movs r1, 0x69 @@ -225902,7 +225902,7 @@ _080E8C68: ands r1, r2 strb r1, [r0, 0x5] movs r1, 0x3 - bl StartObjectImageAnim + bl StartSpriteAnim _080E8C9E: adds r2, r4, 0 adds r2, 0xC @@ -225926,7 +225926,7 @@ _080E8C9E: ands r1, r2 strb r1, [r0, 0x5] movs r1, 0x2 - bl StartObjectImageAnim + bl StartSpriteAnim _080E8CD0: add sp, 0x14 pop {r3} @@ -225937,7 +225937,7 @@ _080E8CD0: .align 2, 0 _080E8CDC: .4byte gUnknown_083DBD48 _080E8CE0: .4byte 0x02024ea4 -_080E8CE4: .4byte nullsub_2 +_080E8CE4: .4byte SpriteCallbackDummy _080E8CE8: .4byte 0x02020004 thumb_func_end sub_80E8BF4 @@ -225947,12 +225947,12 @@ sub_80E8CEC: @ 80E8CEC ldr r0, _080E8D24 bl LoadCompressedObjectPic ldr r0, _080E8D28 - bl LoadTaggedObjectPalette + bl LoadSpritePalette ldr r0, _080E8D2C movs r1, 0xE0 movs r2, 0x58 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -226007,7 +226007,7 @@ sub_80E8D54: @ 80E8D54 bne _080E8D80 adds r0, r1, 0 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim b _080E8D88 .align 2, 0 _080E8D78: .4byte gUnknown_083DB694 @@ -226015,7 +226015,7 @@ _080E8D7C: .4byte 0x00009c74 _080E8D80: adds r0, r1, 0 movs r1, 0x2 - bl StartObjectImageAnim + bl StartSpriteAnim _080E8D88: pop {r0} bx r0 @@ -226042,7 +226042,7 @@ sub_80E8D8C: @ 80E8D8C bne _080E8DC0 adds r0, r1, 0 movs r1, 0x3 - bl StartObjectImageAnim + bl StartSpriteAnim b _080E8DD2 .align 2, 0 _080E8DB8: .4byte gUnknown_083DB694 @@ -226050,12 +226050,12 @@ _080E8DBC: .4byte 0x00009c74 _080E8DC0: adds r0, r1, 0 movs r1, 0x4 - bl StartObjectImageAnim + bl StartSpriteAnim b _080E8DD2 _080E8DCA: adds r0, r1, 0 movs r1, 0x5 - bl StartObjectImageAnim + bl StartSpriteAnim _080E8DD2: pop {r0} bx r0 @@ -231924,10 +231924,10 @@ _080EBB10: bl sub_8073B94 b _080EBBC0 _080EBB16: - bl ResetAllObjectData + bl ResetSpriteData b _080EBBC0 _080EBB1C: - bl ResetObjectPaletteAllocator + bl FreeAllSpritePalettes b _080EBBC0 _080EBB22: bl ResetTasks @@ -232169,8 +232169,8 @@ _080EBD14: .4byte 0x00006db6 thumb_func_start sub_80EBD18 sub_80EBD18: @ 80EBD18 push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram bl sub_80F1FF0 pop {r0} @@ -232180,8 +232180,8 @@ sub_80EBD18: @ 80EBD18 thumb_func_start sub_80EBD30 sub_80EBD30: @ 80EBD30 push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram bl sub_80FB260 bl sub_80EFE7C @@ -232192,8 +232192,8 @@ sub_80EBD30: @ 80EBD30 thumb_func_start sub_80EBD4C sub_80EBD4C: @ 80EBD4C push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram bl sub_80F5BF0 bl sub_8089668 @@ -232204,8 +232204,8 @@ sub_80EBD4C: @ 80EBD4C thumb_func_start sub_80EBD68 sub_80EBD68: @ 80EBD68 push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram bl sub_80F6F64 pop {r0} @@ -232215,8 +232215,8 @@ sub_80EBD68: @ 80EBD68 thumb_func_start sub_80EBD80 sub_80EBD80: @ 80EBD80 push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests pop {r0} bx r0 thumb_func_end sub_80EBD80 @@ -232230,8 +232230,8 @@ sub_80EBD90: @ 80EBD90 adds r0, r1 ldr r0, [r0] bl _call_via_r0 - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl RunTasks bl fade_and_return_progress_probably bl sub_80F19FC @@ -243982,7 +243982,7 @@ _080F1CFC: mov r3, r10 asrs r2, r3, 16 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 @@ -244021,7 +244021,7 @@ _080F1CFC: str r2, [sp] lsls r1, 24 lsrs r1, 24 - bl StartObjectImageAnim + bl StartSpriteAnim mov r2, r9 cmp r2, 0x2 beq _080F1D6E @@ -244032,7 +244032,7 @@ _080F1D6E: cmp r3, 0x2 bls _080F1D88 movs r0, 0x1 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag ldr r3, [r4] lsls r0, 4 ldrb r2, [r3, 0x5] @@ -244301,7 +244301,7 @@ _080F1F4A: ldr r0, _080F1FB0 str r0, [r4, 0x10] adds r0, r4, 0 - bl obj_alloc_rotscale_entry + bl InitSpriteAffineAnim subs r5, 0x6 strh r5, [r4, 0x36] movs r1, 0x36 @@ -244343,11 +244343,11 @@ _080F1FC0: beq _080F1FE4 bl sub_80F21F8 movs r0, 0 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag movs r0, 0 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag movs r0, 0x1 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag movs r0, 0 b _080F1FE6 _080F1FE4: @@ -244947,10 +244947,10 @@ sub_80F240C: @ 80F240C ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix _080F2446: adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite pop {r4} pop {r0} bx r0 @@ -245046,7 +245046,7 @@ _080F24F6: movs r1, 0xE0 lsls r1, 2 adds r0, r1 - bl LoadObjectPic + bl LoadSpriteSheet _080F2502: pop {r4,r5} pop {r0} @@ -245084,7 +245084,7 @@ _080F2532: ands r0, r1 str r0, [sp, 0x4] mov r0, sp - bl LoadTaggedObjectPalette + bl LoadSpritePalette ldr r0, _080F2554 b _080F257A .align 2, 0 @@ -245107,7 +245107,7 @@ _080F2568: movs r0, 0 strh r0, [r4, 0x4] mov r0, sp - bl LoadTaggedObjectPalette + bl LoadSpritePalette ldr r0, _080F2594 _080F257A: str r0, [sp] @@ -245115,7 +245115,7 @@ _080F257A: strh r0, [r4, 0x4] _080F2580: mov r0, sp - bl LoadTaggedObjectPalette + bl LoadSpritePalette _080F2586: add sp, 0x8 pop {r4} @@ -245149,14 +245149,14 @@ sub_80F2598: @ 80F2598 cmp r0, 0x1 bne _080F2618 ldr r0, _080F25FC - bl LoadObjectPic + bl LoadSpriteSheet ldr r0, _080F2600 - bl LoadTaggedObjectPalette + bl LoadSpritePalette ldr r0, _080F2604 movs r1, 0xC movs r2, 0x60 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -245178,9 +245178,9 @@ _080F2604: .4byte gUnknown_083E4484 _080F2608: .4byte 0x02020004 _080F260C: movs r0, 0x19 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag movs r0, 0x11 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag _080F2618: pop {r4} pop {r0} @@ -245197,11 +245197,11 @@ sub_80F2620: @ 80F2620 ldr r0, [r4] cmp r0, 0 beq _080F2644 - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r0, 0x19 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag movs r0, 0x11 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag movs r0, 0 str r0, [r4] _080F2644: @@ -245377,7 +245377,7 @@ _080F27A8: .4byte gUnknown_083DFEC4 _080F27AC: .4byte 0x00004798 _080F27B0: ldr r0, _080F27B8 - bl LoadTaggedObjectPalettes + bl LoadSpritePalettes b _080F27C0 .align 2, 0 _080F27B8: .4byte gUnknown_083E449C @@ -245606,7 +245606,7 @@ _080F2996: orrs r0, r1 str r0, [sp, 0x4] mov r0, sp - bl LoadObjectPic + bl LoadSpriteSheet _080F29A0: add sp, 0x8 pop {r0} @@ -245769,7 +245769,7 @@ _080F2ADA: ldr r3, [sp, 0xC] asrs r2, r3, 16 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x40 @@ -245803,7 +245803,7 @@ _080F2ADA: movs r1, 0x1 _080F2B36: adds r0, r3, 0 - bl StartObjectImageAnim + bl StartSpriteAnim b _080F2B6A .align 2, 0 _080F2B40: .4byte gUnknown_083E4530 @@ -245819,7 +245819,7 @@ _080F2B5C: add r0, r10 lsls r1, r6, 24 lsrs r1, 24 - bl StartObjectImageAnim + bl StartSpriteAnim _080F2B6A: ldr r2, _080F2BB8 mov r12, r2 @@ -245915,7 +245915,7 @@ _080F2C08: pop {r0} bx r0 .align 2, 0 -_080F2C10: .4byte nullsub_2 +_080F2C10: .4byte SpriteCallbackDummy thumb_func_end sub_80F2BBC thumb_func_start sub_80F2C14 @@ -245941,14 +245941,14 @@ sub_80F2C14: @ 80F2C14 cmp r0, 0x4 bgt _080F2C44 movs r0, 0x1 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag b _080F2C4A _080F2C44: movs r0, 0x2 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag _080F2C4A: adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080F2C50: pop {r4} pop {r0} @@ -245970,7 +245970,7 @@ sub_80F2C58: @ 80F2C58 movs r1, 0x1 _080F2C6E: adds r0, r2, 0 - bl StartObjectImageAnim + bl StartSpriteAnim pop {r0} bx r0 .align 2, 0 @@ -246112,7 +246112,7 @@ sub_80F2D6C: @ 80F2D6C cmp r0, 0x4 bhi _080F2DA4 movs r0, 0x1 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag movs r4, 0 ldr r0, _080F2D9C ldr r0, [r0] @@ -246122,7 +246122,7 @@ _080F2D86: lsls r0, r4, 2 adds r0, r5, r0 ldr r0, [r0] - bl RemoveObjectAndFreeTiles + bl DestroySprite adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -246134,7 +246134,7 @@ _080F2D9C: .4byte gUnknown_083DFEC4 _080F2DA0: .4byte 0x00003b88 _080F2DA4: movs r0, 0x2 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag movs r4, 0 ldr r0, _080F2DD0 ldr r0, [r0] @@ -246144,7 +246144,7 @@ _080F2DB4: lsls r0, r4, 2 adds r0, r5, r0 ldr r0, [r0] - bl RemoveObjectAndFreeTiles + bl DestroySprite adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -246237,14 +246237,14 @@ sub_80F2E18: @ 80F2E18 adds r0, r4, r0 str r0, [sp, 0x18] add r0, sp, 0x18 - bl LoadTaggedObjectPalette + bl LoadSpritePalette lsls r0, 24 lsrs r0, 24 ldr r2, _080F2EC0 adds r5, r4, r2 strh r0, [r5] add r0, sp, 0x20 - bl LoadObjectPic + bl LoadSpriteSheet ldr r1, _080F2EC4 adds r6, r4, r1 strh r0, [r6] @@ -246252,15 +246252,15 @@ sub_80F2E18: @ 80F2E18 movs r1, 0x26 movs r2, 0x68 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 bne _080F2EC8 movs r0, 0x6 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag movs r0, 0x6 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag mov r2, r8 str r2, [r7] b _080F2F26 @@ -246344,11 +246344,11 @@ sub_80F2F48: @ 80F2F48 ldr r0, [r4] cmp r0, 0 beq _080F2F6C - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r0, 0x6 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag movs r0, 0x6 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag movs r0, 0 str r0, [r4] _080F2F6C: @@ -246395,11 +246395,11 @@ sub_80F2FB0: @ 80F2FB0 ldr r0, [r4] cmp r0, 0 beq _080F2FDA - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r0, 0x6 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag movs r0, 0x6 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag movs r1, 0 str r1, [r4] ldr r2, _080F2FE8 @@ -246457,14 +246457,14 @@ sub_80F3008: @ 80F3008 str r0, [sp, 0x18] _080F3032: mov r0, sp - bl LoadObjectPics + bl LoadSpriteSheets add r0, sp, 0x18 - bl LoadTaggedObjectPalette + bl LoadSpritePalette ldr r0, _080F306C movs r1, 0x5F movs r2, 0 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -246504,7 +246504,7 @@ _080F3090: ldr r0, _080F3100 movs r1, 0xA8 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -246543,7 +246543,7 @@ _080F30DE: lsls r1, r4, 24 lsrs r1, 24 adds r0, r3, 0 - bl StartObjectImageAnim + bl StartSpriteAnim b _080F3116 .align 2, 0 _080F30F4: .4byte gUnknown_083DFEC4 @@ -246585,11 +246585,11 @@ sub_80F3130: @ 80F3130 ldr r0, [r4] cmp r0, 0 beq _080F3154 - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r0, 0x9 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag movs r0, 0x9 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag movs r0, 0 str r0, [r4] _080F3154: @@ -246602,7 +246602,7 @@ _080F315A: ldr r0, [r4] cmp r0, 0 beq _080F316C - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r0, 0 str r0, [r4] _080F316C: @@ -246612,7 +246612,7 @@ _080F316C: cmp r5, 0x1 bls _080F315A movs r0, 0xA - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag pop {r4-r6} pop {r0} bx r0 @@ -246857,7 +246857,7 @@ sub_80F3328: @ 80F3328 bne _080F3354 adds r0, r2, 0 movs r1, 0 - bl StartObjectImageAnim + bl StartSpriteAnim b _080F335C .align 2, 0 _080F334C: .4byte gUnknown_083DFEC4 @@ -246865,7 +246865,7 @@ _080F3350: .4byte 0x000087dc _080F3354: adds r0, r2, 0 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim _080F335C: pop {r0} bx r0 @@ -246897,7 +246897,7 @@ _080F338C: .4byte 0x000087da _080F3390: movs r0, 0x5 _080F3392: - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 4 ldrb r2, [r4, 0x5] movs r1, 0xF @@ -246938,9 +246938,9 @@ sub_80F33A8: @ 80F33A8 ldm r0!, {r2,r3,r6} stm r1!, {r2,r3,r6} mov r0, sp - bl LoadObjectPics + bl LoadSpriteSheets adds r0, r4, 0 - bl LoadTaggedObjectPalettes + bl LoadSpritePalettes movs r6, 0 ldr r2, _080F344C ldr r1, [r2] @@ -246967,7 +246967,7 @@ _080F3406: adds r0, r7, 0 movs r1, 0xE2 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 @@ -247028,7 +247028,7 @@ _080F3488: adds r0, r7, 0 movs r1, 0xE6 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 @@ -247050,7 +247050,7 @@ _080F3488: b _080F34E4 .align 2, 0 _080F34C8: .4byte 0x000087e4 -_080F34CC: .4byte nullsub_2 +_080F34CC: .4byte SpriteCallbackDummy _080F34D0: .4byte gUnknown_083DFEC4 _080F34D4: .4byte 0x02020004 _080F34D8: @@ -247081,7 +247081,7 @@ _080F34EE: adds r0, r7, 0 movs r1, 0xDE movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 @@ -247150,7 +247150,7 @@ _080F3588: ldr r0, [r4] cmp r0, 0 beq _080F359A - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r0, 0 str r0, [r4] _080F359A: @@ -247219,11 +247219,11 @@ sub_80F3614: @ 80F3614 ldr r1, _080F3638 adds r0, r1 ldr r0, [r0] - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r0, 0x1B - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag movs r0, 0x15 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag pop {r0} bx r0 .align 2, 0 @@ -247245,7 +247245,7 @@ sub_80F363C: @ 80F363C adds r1, r3 adds r1, r2 ldrb r1, [r1] - bl StartObjectImageAnim + bl StartSpriteAnim pop {r0} bx r0 .align 2, 0 @@ -247722,7 +247722,7 @@ sub_80F39A4: @ 80F39A4 orrs r0, r1 str r0, [sp, 0x4] mov r0, sp - bl LoadObjectPic + bl LoadSpriteSheet ldrb r0, [r4] cmp r0, 0x4 bhi _080F3A04 @@ -247737,7 +247737,7 @@ sub_80F39A4: @ 80F39A4 ands r1, r5 orrs r1, r2 str r1, [r0, 0x4] - bl LoadTaggedObjectPalette + bl LoadSpritePalette _080F3A04: ldrb r0, [r4] adds r0, 0x1 @@ -247832,7 +247832,7 @@ _080F3A78: asrs r2, 16 mov r0, sp movs r3, 0x2 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -247881,7 +247881,7 @@ sub_80F3B00: @ 80F3B00 beq _080F3B48 adds r0, r2, 0 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim ldr r2, _080F3B44 adds r1, r4, r2 movs r0, 0x1 @@ -247951,7 +247951,7 @@ sub_80F3B94: @ 80F3B94 beq _080F3BC4 adds r0, r2, 0 movs r1, 0x2 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim ldr r0, _080F3BC0 adds r1, r4, r0 movs r0, 0x1 @@ -248000,9 +248000,9 @@ sub_80F3BD4: @ 80F3BD4 ldrb r0, [r0, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix ldr r0, [r4] - bl RemoveObjectAndFreeTiles + bl DestroySprite str r6, [r4] _080F3C12: ldrb r0, [r5] @@ -248032,9 +248032,9 @@ sub_80F3C2C: @ 80F3C2C ldrb r0, [r0, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix ldr r0, [r4] - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r0, 0 str r0, [r4] _080F3C50: @@ -248044,7 +248044,7 @@ _080F3C52: adds r0, 0xB lsls r0, 16 lsrs r0, 16 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -248056,7 +248056,7 @@ _080F3C6A: adds r0, 0xA lsls r0, 16 lsrs r0, 16 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -248086,9 +248086,9 @@ sub_80F3C94: @ 80F3C94 str r0, [sp, 0x8] str r1, [sp, 0xC] mov r0, sp - bl LoadObjectPic + bl LoadSpriteSheet add r0, sp, 0x8 - bl LoadTaggedObjectPalette + bl LoadSpritePalette movs r1, 0 ldr r0, _080F3CE4 ldr r0, [r0] @@ -248119,9 +248119,9 @@ sub_80F3CE8: @ 80F3CE8 push {lr} bl move_anim_execute movs r0, 0x17 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag movs r0, 0xF - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag pop {r0} bx r0 thumb_func_end sub_80F3CE8 @@ -248165,7 +248165,7 @@ _080F3D48: movs r1, 0 movs r2, 0 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -248224,7 +248224,7 @@ _080F3DB6: ldr r0, [r4] cmp r0, 0 beq _080F3DD2 - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r0, 0 str r0, [r4] adds r0, r5, 0x1 @@ -248363,7 +248363,7 @@ sub_80F3E9C: @ 80F3E9C bne _080F3F14 adds r0, r4, 0 movs r1, 0 - bl SeekObjectImageAnim + bl SeekSpriteAnim adds r2, r4, 0 adds r2, 0x3E ldrb r1, [r2] @@ -248414,7 +248414,7 @@ _080F3F14: pop {r0} bx r0 .align 2, 0 -_080F3F1C: .4byte nullsub_2 +_080F3F1C: .4byte SpriteCallbackDummy thumb_func_end sub_80F3E9C thumb_func_start sub_80F3F20 @@ -248509,7 +248509,7 @@ _080F3FC0: cmp r0, 0 beq _080F3FDA movs r1, 0 - bl SeekObjectImageAnim + bl SeekSpriteAnim ldr r1, [r4] adds r1, 0x3E ldrb r0, [r1] @@ -248597,7 +248597,7 @@ _080F4068: ldr r0, _080F4080 str r0, [sp, 0x4] mov r0, sp - bl LoadObjectPic + bl LoadSpriteSheet b _080F4118 .align 2, 0 _080F407C: .4byte 0x000131e4 @@ -248609,9 +248609,9 @@ _080F4084: str r0, [sp, 0x8] str r1, [sp, 0xC] add r0, sp, 0x8 - bl LoadTaggedObjectPalette + bl LoadSpritePalette movs r0, 0x10 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 24 movs r1, 0xC2 @@ -248632,7 +248632,7 @@ _080F40B8: movs r1, 0xDA movs r2, 0xE movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -248906,9 +248906,9 @@ sub_80F42C4: @ 80F42C4 str r2, [sp, 0x4] bl sub_80F4194 mov r0, sp - bl LoadObjectPic + bl LoadSpriteSheet ldr r0, _080F4348 - bl LoadTaggedObjectPalette + bl LoadSpritePalette movs r5, 0 movs r4, 0 ldr r6, _080F434C @@ -248921,7 +248921,7 @@ _080F42EE: ldr r0, _080F4350 movs r2, 0x10 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -249002,7 +249002,7 @@ _080F43A0: ldr r0, [r0] cmp r0, 0 beq _080F43AE - bl RemoveObjectAndFreeTiles + bl DestroySprite _080F43AE: adds r0, r4, 0x1 lsls r0, 16 @@ -249010,9 +249010,9 @@ _080F43AE: cmp r4, 0x4 bls _080F43A0 movs r0, 0x1A - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag movs r0, 0x12 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag pop {r4,r5} pop {r0} bx r0 @@ -249032,7 +249032,7 @@ sub_80F43D4: @ 80F43D4 adds r0, r4, 0 bl sub_80F4194 movs r0, 0x1A - bl GetObjectTileRangeStartByTag + bl GetSpriteTileStartByTag lsls r0, 16 lsrs r1, r0, 16 ldr r0, _080F4418 @@ -255263,7 +255263,7 @@ _080F7476: adds r0, r4, r0 lsls r0, 16 lsrs r0, 16 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -255272,13 +255272,13 @@ _080F7476: ldr r4, _080F74FC ldr r0, [r4] ldrh r0, [r0, 0x2] - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag ldr r0, [r4] ldrh r0, [r0, 0x2] adds r0, 0x1 lsls r0, 16 lsrs r0, 16 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag movs r4, 0 _080F74A8: ldr r0, _080F74FC @@ -255289,7 +255289,7 @@ _080F74A8: ldr r0, [r0] cmp r0, 0 beq _080F74F6 - bl RemoveObjectAndFreeTiles + bl DestroySprite adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -255305,7 +255305,7 @@ _080F74C8: ldr r0, [r0] cmp r0, 0 beq _080F74F6 - bl RemoveObjectAndFreeTiles + bl DestroySprite adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -255316,7 +255316,7 @@ _080F74C8: ldr r0, [r0, 0x24] cmp r0, 0 beq _080F74F6 - bl RemoveObjectAndFreeTiles + bl DestroySprite _080F74F6: pop {r4,r5} pop {r0} @@ -255365,7 +255365,7 @@ sub_80F7500: @ 80F7500 cmp r0, 0 beq _080F7558 mov r0, sp - bl sub_800239C + bl LoadTilesForSpriteSheets ldr r0, [r4] strb r5, [r0, 0xB] _080F7558: @@ -255564,9 +255564,9 @@ sub_80F761C: @ 80F761C movs r0, 0x1 strb r0, [r1, 0xB] add r0, sp, 0x4 - bl sub_8002344 + bl AllocTilesForSpriteSheets adds r0, r6, 0 - bl LoadTaggedObjectPalettes + bl LoadSpritePalettes movs r5, 0 ldr r1, [sp, 0x4C] lsls r0, r1, 16 @@ -255587,7 +255587,7 @@ _080F7700: asrs r1, r2, 16 asrs r2, r7, 16 movs r3, 0x2 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 @@ -255607,7 +255607,7 @@ _080F7718: str r0, [r2] lsls r1, r5, 24 lsrs r1, 24 - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 @@ -255650,7 +255650,7 @@ _080F7770: mov r3, r10 asrs r1, r3, 16 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 @@ -255678,7 +255678,7 @@ _080F7770: movs r1, 0 movs r2, 0 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 @@ -255704,7 +255704,7 @@ _080F7770: ldr r0, [r6] ldr r0, [r0, 0x24] movs r1, 0x9 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r1, [r6] ldr r2, [r1, 0x24] ldr r3, [sp, 0x58] @@ -255719,7 +255719,7 @@ _080F7770: movs r1, 0x1 movs r2, 0x2 movs r3, 0 - bl CalcVecFromObjectCenterToObjectUpperLeft + bl CalcCenterToCornerVec b _080F787A .align 2, 0 _080F7820: .4byte 0x020388b8 @@ -255727,13 +255727,13 @@ _080F7824: .4byte gUnknown_08E8A7C4 _080F7828: .4byte gUnknown_08E966B8 _080F782C: .4byte gUnknown_083E5214 _080F7830: .4byte gUnknown_083E52AC -_080F7834: .4byte gDummyObjectRotScalAnimTable +_080F7834: .4byte gDummySpriteAffineAnimTable _080F7838: .4byte nullsub_65 _080F783C: .4byte 0x02020004 _080F7840: .4byte gUnknown_083E5274 _080F7844: .4byte sub_80F78CC _080F7848: .4byte gUnknown_083E521C -_080F784C: .4byte nullsub_2 +_080F784C: .4byte SpriteCallbackDummy _080F7850: ldr r0, _080F785C ldr r0, [r0] @@ -255820,7 +255820,7 @@ sub_80F78CC: @ 80F78CC lsls r1, 24 lsrs r1, 24 adds r0, r2, 0 - bl StartObjectImageAnim + bl StartSpriteAnim b _080F7902 .align 2, 0 _080F78F4: .4byte 0x020388b8 @@ -255828,7 +255828,7 @@ _080F78F8: lsls r1, 25 lsrs r1, 24 adds r0, r2, 0 - bl StartObjectImageAnim + bl StartSpriteAnim _080F7902: pop {r0} bx r0 @@ -255933,14 +255933,14 @@ sub_80F7960: @ 80F7960 orrs r0, r3 str r0, [r5, 0x4] adds r0, r5, 0 - bl LoadObjectPic + bl LoadSpriteSheet adds r0, r4, 0 - bl LoadTaggedObjectPalette + bl LoadSpritePalette mov r0, sp movs r1, 0 movs r2, 0 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -255952,7 +255952,7 @@ _080F79DC: .4byte gUnknown_083E4A14 _080F79E0: .4byte 0xffff0000 _080F79E4: .4byte gUnknown_083E52B4 _080F79E8: .4byte gUnknown_083E533C -_080F79EC: .4byte gDummyObjectRotScalAnimTable +_080F79EC: .4byte gDummySpriteAffineAnimTable _080F79F0: .4byte nullsub_65 _080F79F4: lsls r0, r1, 4 @@ -258213,10 +258213,10 @@ _080F8ACE: bl ResetTasks b _080F8D30 _080F8AD4: - bl ResetAllObjectData + bl ResetSpriteData b _080F8D30 _080F8ADA: - bl ResetObjectPaletteAllocator + bl FreeAllSpritePalettes ldr r0, _080F8B0C movs r1, 0 strh r1, [r0] @@ -258425,7 +258425,7 @@ _080F8C80: movs r2, 0x60 b _080F8CA8 .align 2, 0 -_080F8C94: .4byte nullsub_2 +_080F8C94: .4byte SpriteCallbackDummy _080F8C98: adds r0, r4, 0 bl sub_809D580 @@ -258442,7 +258442,7 @@ _080F8CA8: strb r0, [r1] b _080F8D30 .align 2, 0 -_080F8CB8: .4byte nullsub_2 +_080F8CB8: .4byte SpriteCallbackDummy _080F8CBC: bl sub_8055870 cmp r0, 0x1 @@ -258750,8 +258750,8 @@ _080F8F14: .4byte 0x020000d8 thumb_func_start sub_80F8F18 sub_80F8F18: @ 80F8F18 push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -258766,8 +258766,8 @@ sub_80F8F2C: @ 80F8F2C ldrb r0, [r0] cmp r0, 0 beq _080F8F42 - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer _080F8F42: adds r0, r4, 0 adds r0, 0xF0 @@ -259469,9 +259469,9 @@ _080F9454: cmp r2, 0x3 bls _080F9454 movs r0, 0x6 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag ldr r0, _080F947C - bl LoadTaggedObjectPalette + bl LoadSpritePalette pop {r4} pop {r0} bx r0 @@ -259525,7 +259525,7 @@ sub_80F94A4: @ 80F94A4 lsls r2, 16 asrs r2, 16 movs r3, 0 - bl AddObjectToFront + bl CreateSprite strb r0, [r5] _080F94D0: subs r0, r4, 0x4 @@ -259538,7 +259538,7 @@ _080F94D0: ldr r1, _080F94F4 adds r0, r1 adds r1, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim _080F94E8: pop {r4,r5} pop {r0} @@ -259561,7 +259561,7 @@ sub_80F94F8: @ 80F94F8 lsls r0, 2 ldr r1, _080F951C adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r0, 0xFF strb r0, [r4] _080F9516: @@ -259640,7 +259640,7 @@ _080F9584: lsls r2, 16 asrs r2, 16 movs r3, 0 - bl AddObjectToFront + bl CreateSprite strb r0, [r5] ldr r3, _080F95E0 ldrb r1, [r5] @@ -259701,7 +259701,7 @@ _080F9602: lsls r2, 16 asrs r2, 16 movs r3, 0 - bl AddObjectToFront + bl CreateSprite strb r0, [r5, 0x1] ldr r3, _080F9668 ldrb r1, [r5, 0x1] @@ -259766,7 +259766,7 @@ _080F967C: lsls r2, 16 asrs r2, 16 movs r3, 0 - bl AddObjectToFront + bl CreateSprite strb r0, [r5, 0x2] ldr r3, _080F96EC ldrb r1, [r5, 0x2] @@ -259825,7 +259825,7 @@ _080F96F8: lsls r2, 16 asrs r2, 16 movs r3, 0 - bl AddObjectToFront + bl CreateSprite strb r0, [r5, 0x3] ldr r3, _080F9768 ldrb r1, [r5, 0x3] @@ -259888,7 +259888,7 @@ _080F977A: adds r0, r1 movs r1, 0x1 ands r1, r4 - bl StartObjectImageAnim + bl StartSpriteAnim _080F9790: pop {r4,r5} pop {r0} @@ -259953,7 +259953,7 @@ SetBgTilemapBuffer: @ 80F97E0 lsls r0, 2 ldr r1, _080F9814 adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r0, 0xFF strb r0, [r4] _080F9808: @@ -259969,7 +259969,7 @@ _080F9814: .4byte 0x02020004 InitMenuInUpperLeftCornerPlaySoundWhenAPressed: @ 80F9818 push {lr} ldr r0, _080F9824 - bl LoadTaggedObjectPalette + bl LoadSpritePalette pop {r0} bx r0 .align 2, 0 @@ -259980,7 +259980,7 @@ _080F9824: .4byte gUnknown_083E5968 BuyMenuFreeMemory: @ 80F9828 push {lr} movs r0, 0x6 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag pop {r0} bx r0 thumb_func_end BuyMenuFreeMemory @@ -260080,7 +260080,7 @@ _080F98CA: .align 2, 0 _080F98D0: .4byte 0x020388c0 _080F98D4: .4byte 0x02020004 -_080F98D8: .4byte nullsub_2 +_080F98D8: .4byte SpriteCallbackDummy thumb_func_end sub_80F98A4 thumb_func_start sub_80F98DC @@ -262460,29 +262460,29 @@ sub_80FAB10: @ 80FAB10 ldr r0, [r0, 0x1C] cmp r0, 0 beq _080FAB34 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r0, [r4] adds r0, 0x58 ldrh r0, [r0] - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag ldr r0, [r4] adds r0, 0x5A ldrh r0, [r0] - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag _080FAB34: ldr r0, [r4] ldr r0, [r0, 0x20] cmp r0, 0 beq _080FAB54 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r0, [r4] adds r0, 0x70 ldrh r0, [r0] - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag ldr r0, [r4] adds r0, 0x72 ldrh r0, [r0] - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag _080FAB54: pop {r4} pop {r0} @@ -264634,14 +264634,14 @@ _080FBBC0: _080FBBD6: str r0, [sp, 0x14] adds r0, r2, 0 - bl LoadObjectPic + bl LoadSpriteSheet adds r0, r7, 0 - bl LoadTaggedObjectPalette + bl LoadSpritePalette mov r0, sp movs r1, 0x38 movs r2, 0x48 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -264675,7 +264675,7 @@ _080FBBD6: strh r0, [r1, 0x22] ldr r0, [r2, 0x1C] movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim b _080FBC6C .align 2, 0 _080FBC38: .4byte nullsub_66 @@ -264709,7 +264709,7 @@ _080FBC6C: movs r0, 0x2 strh r0, [r1, 0x30] adds r0, r6, 0 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag ldr r1, [r4] ldr r2, [r1, 0x1C] lsls r0, 24 @@ -264738,15 +264738,15 @@ sub_80FBCA0: @ 80FBCA0 ldr r0, [r0, 0x1C] cmp r0, 0 beq _080FBCC4 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r0, [r4] adds r0, 0x58 ldrh r0, [r0] - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag ldr r0, [r4] adds r0, 0x5A ldrh r0, [r0] - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag _080FBCC4: pop {r4} pop {r0} @@ -264824,14 +264824,14 @@ sub_80FBCF0: @ 80FBCF0 str r0, [sp, 0x20] _080FBD42: adds r0, r5, 0 - bl LoadObjectPic + bl LoadSpriteSheet adds r0, r4, 0 - bl LoadTaggedObjectPalette + bl LoadSpritePalette mov r0, sp movs r1, 0 movs r2, 0 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r1, _080FBDC0 @@ -264869,8 +264869,8 @@ _080FBD9C: .4byte gUnknown_083E5C20 _080FBDA0: .4byte 0xffff0000 _080FBDA4: .4byte gUnknown_083E7708 _080FBDA8: .4byte gUnknown_083E7718 -_080FBDAC: .4byte gDummyObjectRotScalAnimTable -_080FBDB0: .4byte nullsub_2 +_080FBDAC: .4byte gDummySpriteAffineAnimTable +_080FBDB0: .4byte SpriteCallbackDummy _080FBDB4: .4byte 0x02024ea4 _080FBDB8: .4byte gUnknown_083E5CE0 _080FBDBC: .4byte gUnknown_083E5CC0 @@ -264925,7 +264925,7 @@ _080FBE16: bx r0 .align 2, 0 _080FBE1C: .4byte 0x020388cc -_080FBE20: .4byte nullsub_2 +_080FBE20: .4byte SpriteCallbackDummy thumb_func_end sub_80FBDF8 thumb_func_start sub_80FBE24 @@ -265314,9 +265314,9 @@ _080FC0C4: adds r0, 0x2 strh r1, [r0] bl sub_8073B94 - bl ResetAllObjectData - bl FreeAllObjectTiles - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpriteTiles + bl FreeAllSpritePalettes b _080FC1E6 _080FC104: ldr r0, _080FC10C @@ -265441,8 +265441,8 @@ _080FC210: .4byte 0x0000043c thumb_func_start sub_80FC214 sub_80FC214: @ 80FC214 push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -265454,8 +265454,8 @@ sub_80FC228: @ 80FC228 ldr r0, _080FC240 ldr r0, [r0] bl _call_via_r0 - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer pop {r0} bx r0 .align 2, 0 @@ -265593,9 +265593,9 @@ sub_80FC31C: @ 80FC31C orrs r0, r1 str r0, [sp, 0x4] mov r0, sp - bl LoadObjectPic + bl LoadSpriteSheet ldr r0, _080FC370 - bl LoadTaggedObjectPalette + bl LoadSpritePalette bl sub_80FC374 bl sub_80FC484 add sp, 0x8 @@ -265678,7 +265678,7 @@ _080FC3E4: ldrsh r2, [r3, r0] ldr r0, _080FC430 movs r3, 0xA - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x40 @@ -265722,7 +265722,7 @@ _080FC442: lsls r1, r7, 24 lsrs r1, 24 adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim mov r2, r9 strh r2, [r4, 0x2E] _080FC458: @@ -265806,7 +265806,7 @@ _080FC4AC: ldrsh r2, [r5, r0] ldr r0, _080FC554 movs r3, 0xA - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -265827,7 +265827,7 @@ _080FC4AC: str r0, [r2] adds r0, r4, 0 movs r1, 0x6 - bl StartObjectImageAnim + bl StartSpriteAnim strh r6, [r4, 0x2E] _080FC524: mov r0, r8 @@ -269887,7 +269887,7 @@ gpu_pal_decompress_alloc_tag_and_upload: @ 80FE3C4 movs r3, 0x12 bl sub_8071EBC movs r0, 0x6 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag ldr r0, _080FE404 ldrb r0, [r0, 0x9] cmp r0, 0 @@ -272412,7 +272412,7 @@ AddDecorationIconObjectFromFieldObject: @ 80FF780 lsrs r1, 12 bl sub_810070C ldr r0, _080FF81C - bl LoadTaggedObjectPalette + bl LoadSpritePalette ldr r3, _080FF820 ldr r2, _080FF824 ldr r4, _080FF828 @@ -272432,7 +272432,7 @@ AddDecorationIconObjectFromFieldObject: @ 80FF780 ldrb r1, [r2, 0x2] ldrb r2, [r2, 0x3] movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 str r0, [r4, 0x4] @@ -272546,7 +272546,7 @@ _080FF8DE: _080FF8F0: .4byte 0x03004b20 _080FF8F4: .4byte gUnknown_083EC900 _080FF8F8: .4byte 0x02024ea4 -_080FF8FC: .4byte nullsub_2 +_080FF8FC: .4byte SpriteCallbackDummy _080FF900: ldr r1, _080FF94C movs r0, 0 @@ -272577,7 +272577,7 @@ _080FF908: adds r0, r1 lsls r0, 2 adds r0, r3 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r0, _080FF95C ldr r0, [r0, 0x4] strb r0, [r4] @@ -272586,7 +272586,7 @@ _080FF908: pop {r0} bx r0 .align 2, 0 -_080FF94C: .4byte nullsub_2 +_080FF94C: .4byte SpriteCallbackDummy _080FF950: .4byte 0x020391a9 _080FF954: .4byte 0x02020004 _080FF958: .4byte 0x020391a8 @@ -273848,7 +273848,7 @@ _081002FC: .4byte 0x0202f388 _08100300: bl sub_81016F4 ldr r0, _08100324 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag ldr r1, _08100328 ldr r0, _0810032C str r0, [r1] @@ -275297,7 +275297,7 @@ SetUpPuttingAwayDecorationPlayerAvatar: @ 8100D84 movs r1, 0x78 movs r2, 0x50 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 str r0, [r4, 0x4] @@ -275315,7 +275315,7 @@ _08100DDC: .4byte 0x02020004 _08100DE0: .4byte 0x03004880 _08100DE4: .4byte gUnknown_083ECA88 _08100DE8: .4byte 0x02024ea4 -_08100DEC: .4byte nullsub_2 +_08100DEC: .4byte SpriteCallbackDummy _08100DF0: ldr r1, _08100E5C movs r0, 0 @@ -275350,7 +275350,7 @@ _08100DF8: adds r0, r1 lsls r0, 2 adds r0, r6 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r0, _08100E6C ldr r0, [r0, 0x4] strb r0, [r5] @@ -275371,7 +275371,7 @@ _08100DF8: pop {r0} bx r0 .align 2, 0 -_08100E5C: .4byte nullsub_2 +_08100E5C: .4byte SpriteCallbackDummy _08100E60: .4byte 0x020391a9 _08100E64: .4byte 0x02020004 _08100E68: .4byte 0x020391a8 @@ -275586,7 +275586,7 @@ sub_8100FB4: @ 8100FB4 _0810100C: .4byte 0x03004b20 _08101010: .4byte 0x02020004 _08101014: .4byte 0x020391a8 -_08101018: .4byte nullsub_2 +_08101018: .4byte SpriteCallbackDummy _0810101C: .4byte gUnknown_0840FC87 _08101020: .4byte sub_810156C thumb_func_end sub_8100FB4 @@ -275667,7 +275667,7 @@ _081010B0: _081010BC: .4byte 0x03004b28 _081010C0: .4byte 0x02020004 _081010C4: .4byte 0x020391a8 -_081010C8: .4byte nullsub_2 +_081010C8: .4byte SpriteCallbackDummy _081010CC: .4byte gUnknown_0840FC87 _081010D0: .4byte sub_810156C _081010D4: @@ -275839,7 +275839,7 @@ sub_8101198: @ 8101198 .align 2, 0 _081011F0: .4byte 0x02020004 _081011F4: .4byte 0x020391a8 -_081011F8: .4byte nullsub_2 +_081011F8: .4byte SpriteCallbackDummy _081011FC: .4byte 0x020391a9 thumb_func_end sub_8101198 @@ -276483,14 +276483,14 @@ sub_81016C8: @ 81016C8 cmp r0, 0 bne _081016E4 ldr r0, _081016E0 - bl LoadTaggedObjectPalette + bl LoadSpritePalette b _081016EA .align 2, 0 _081016DC: .4byte 0x02024ea4 _081016E0: .4byte gUnknown_083ECA5C _081016E4: ldr r0, _081016F0 - bl LoadTaggedObjectPalette + bl LoadSpritePalette _081016EA: pop {r0} bx r0 @@ -276502,7 +276502,7 @@ _081016F0: .4byte gUnknown_083ECA64 sub_81016F4: @ 81016F4 push {lr} movs r0, 0x8 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag pop {r0} bx r0 thumb_func_end sub_81016F4 @@ -276791,8 +276791,8 @@ _08101950: .4byte sub_8101954 sub_8101954: @ 8101954 push {lr} bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r0} bx r0 @@ -276801,8 +276801,8 @@ sub_8101954: @ 8101954 thumb_func_start sub_810196C sub_810196C: @ 810196C push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram ldr r1, _081019A8 ldr r2, _081019AC @@ -277212,11 +277212,11 @@ _08101C9C: .4byte gUnknown_081E7128 sub_8101CA0: @ 8101CA0 push {lr} bl sub_8073B94 - bl ResetAllObjectData + bl ResetSpriteData ldr r1, _08101CBC movs r0, 0x80 strb r0, [r1] - bl ResetObjectPaletteAllocator + bl FreeAllSpritePalettes bl ResetTasks pop {r0} bx r0 @@ -281759,7 +281759,7 @@ sub_8103DC8: @ 8103DC8 ldr r5, _08103DFC _08103DD0: ldr r0, _08103E00 - bl obj_add_empty_with_callback + bl CreateInvisibleSprite lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -282749,7 +282749,7 @@ sub_8104498: @ 8104498 mov r2, sp adds r1, r2, r5 ldrb r1, [r1] - bl StartObjectImageAnimIfDifferent + bl StartSpriteAnimIfDifferent movs r1, 0x10 ldrsh r0, [r7, r1] movs r1, 0x80 @@ -282808,7 +282808,7 @@ sub_8104548: @ 8104548 ldr r1, _08104594 adds r0, r1 movs r1, 0x3 - bl StartObjectImageAnimIfDifferent + bl StartSpriteAnimIfDifferent _0810458A: pop {r4} pop {r0} @@ -283008,7 +283008,7 @@ sub_81046C0: @ 81046C0 ldr r1, _08104714 adds r0, r1 movs r1, 0x5 - bl StartObjectImageAnimIfDifferent + bl StartSpriteAnimIfDifferent ldr r0, _08104718 bl fanfare_play b _08104758 @@ -283028,7 +283028,7 @@ _0810471C: ldr r4, _08104760 adds r0, r4 movs r1, 0x4 - bl StartObjectImageAnimIfDifferent + bl StartSpriteAnimIfDifferent ldrb r1, [r6] lsls r0, r1, 4 adds r0, r1 @@ -283268,7 +283268,7 @@ sub_81048CC: @ 81048CC lsls r0, 2 adds r0, r5 movs r1, 0x5 - bl StartObjectImageAnimIfDifferent + bl StartSpriteAnimIfDifferent ldrh r0, [r4, 0x8] adds r0, 0x1 movs r1, 0 @@ -283912,7 +283912,7 @@ _08104DD4: lsls r0, 2 ldr r1, _08104E14 adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r0, 0x40 strh r0, [r4] _08104DF4: @@ -284025,7 +284025,7 @@ _08104EB4: asrs r1, r5, 16 movs r2, 0 movs r3, 0xE - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -284112,12 +284112,12 @@ sub_8104F18: @ 8104F18 bl sub_8102BA4 lsls r0, 24 lsrs r0, 24 - bl GetObjectTileRangeStartByTag + bl GetSpriteTileStartByTag adds r1, r5, 0 adds r1, 0x40 strh r0, [r1] adds r0, r5, 0 - bl sub_80020D4 + bl SetSpriteSheetFrameTileNum pop {r4,r5} pop {r0} bx r0 @@ -284204,7 +284204,7 @@ sub_8104FF4: @ 8104FF4 adds r1, r5, 0 adds r2, r6, 0 movs r3, 0xD - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r2, r0, 4 @@ -284272,12 +284272,12 @@ _0810507E: adds r0, r3 lsrs r2, r0, 16 adds r0, r2, 0 - bl GetObjectTileRangeStartByTag + bl GetSpriteTileStartByTag adds r1, r4, 0 adds r1, 0x40 strh r0, [r1] adds r0, r4, 0 - bl sub_80020D4 + bl SetSpriteSheetFrameTileNum _081050B8: pop {r4} pop {r0} @@ -284293,7 +284293,7 @@ sub_81050C4: @ 81050C4 movs r1, 0x58 movs r2, 0x48 movs r3, 0xF - bl AddObjectToFront + bl CreateSprite adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -284307,7 +284307,7 @@ sub_81050C4: @ 81050C4 orrs r1, r2 strb r1, [r0, 0x5] ldr r1, _081050FC - bl SetSpriteOamTables_NoPriorityFromTable + bl SetSubspriteTables pop {r0} bx r0 .align 2, 0 @@ -284324,7 +284324,7 @@ sub_8105100: @ 8105100 lsls r1, 1 movs r2, 0x50 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r1, _08105144 @@ -284366,7 +284366,7 @@ sub_810514C: @ 810514C lsls r0, 2 ldr r1, _0810516C adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite pop {r0} bx r0 .align 2, 0 @@ -284433,7 +284433,7 @@ sub_81051C0: @ 81051C0 adds r1, r7, 0 movs r2, 0x34 movs r3, 0x7 - bl AddObjectToFront + bl CreateSprite adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -284463,7 +284463,7 @@ sub_81051C0: @ 81051C0 strb r0, [r1] ldr r1, _08105274 adds r0, r2, 0 - bl SetSpriteOamTables_NoPriorityFromTable + bl SetSubspriteTables ldr r6, _08105278 adds r0, r6, 0 adds r0, 0x49 @@ -284472,7 +284472,7 @@ sub_81051C0: @ 81051C0 adds r1, r7, 0 movs r2, 0x54 movs r3, 0x7 - bl AddObjectToFront + bl CreateSprite adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -284494,7 +284494,7 @@ sub_81051C0: @ 81051C0 strb r0, [r1] ldr r1, _08105280 adds r0, r2, 0 - bl SetSpriteOamTables_NoPriorityFromTable + bl SetSubspriteTables adds r6, 0x4A strb r4, [r6] pop {r3-r5} @@ -284525,7 +284525,7 @@ sub_8105284: @ 8105284 asrs r1, 16 movs r2, 0x50 movs r3, 0x7 - bl AddObjectToFront + bl CreateSprite adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -284548,7 +284548,7 @@ sub_8105284: @ 8105284 orrs r1, r2 strb r1, [r3] ldr r1, _081052E4 - bl SetSpriteOamTables_NoPriorityFromTable + bl SetSubspriteTables ldr r0, _081052E8 adds r0, 0x42 strb r4, [r0] @@ -284575,7 +284575,7 @@ _081052F4: lsls r1, 1 movs r2, 0 movs r3, 0xA - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r3, r0, 4 @@ -284647,7 +284647,7 @@ sub_810535C: @ 810535C lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl StartObjectImageAnimIfDifferent + bl StartSpriteAnimIfDifferent pop {r4} pop {r0} bx r0 @@ -284667,7 +284667,7 @@ sub_81053A0: @ 81053A0 ldr r0, _0810544C movs r2, 0x64 movs r3, 0x9 - bl AddObjectToFront + bl CreateSprite adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -284698,7 +284698,7 @@ sub_81053A0: @ 81053A0 mov r9, r0 adds r0, r2, 0 mov r1, r9 - bl SetSpriteOamTables_NoPriorityFromTable + bl SetSubspriteTables ldr r6, _08105458 adds r0, r6, 0 adds r0, 0x4E @@ -284708,7 +284708,7 @@ sub_81053A0: @ 81053A0 ldr r0, _0810544C movs r2, 0x68 movs r3, 0x4 - bl AddObjectToFront + bl CreateSprite adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -284729,7 +284729,7 @@ sub_81053A0: @ 81053A0 strb r5, [r2, 0x5] adds r0, r2, 0 mov r1, r9 - bl SetSpriteOamTables_NoPriorityFromTable + bl SetSubspriteTables adds r6, 0x4F strb r4, [r6] pop {r3-r5} @@ -284754,7 +284754,7 @@ sub_810545C: @ 810545C lsls r1, 1 movs r2, 0x4C movs r3, 0xB - bl AddObjectToFront + bl CreateSprite adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -284777,7 +284777,7 @@ sub_810545C: @ 810545C orrs r1, r2 strb r1, [r0, 0x5] ldr r1, _081054B0 - bl SetSpriteOamTables_NoPriorityFromTable + bl SetSubspriteTables ldr r0, _081054B4 adds r0, 0x40 strb r4, [r0] @@ -284803,7 +284803,7 @@ sub_81054B8: @ 81054B8 lsls r0, 2 ldr r1, _0810551C adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r5, 0 adds r4, 0x49 _081054D4: @@ -284814,7 +284814,7 @@ _081054D4: lsls r0, 2 ldr r1, _0810551C adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -284830,7 +284830,7 @@ _081054F4: lsls r0, 2 ldr r1, _0810551C adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -284858,7 +284858,7 @@ _0810552A: lsls r0, 2 ldr r1, _08105550 adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -284883,7 +284883,7 @@ sub_8105554: @ 8105554 lsls r0, 2 ldr r1, _08105574 adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite pop {r0} bx r0 .align 2, 0 @@ -284903,7 +284903,7 @@ sub_8105578: @ 8105578 movs r1, 0x98 movs r2, 0x20 movs r3, 0x5 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -284945,7 +284945,7 @@ sub_8105578: @ 8105578 movs r1, 0xB8 movs r2, 0x20 movs r3, 0x5 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -285074,7 +285074,7 @@ _081056C6: lsls r0, 2 ldr r1, _081056EC adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -285099,7 +285099,7 @@ sub_81056F0: @ 81056F0 movs r1, 0x48 movs r2, 0x50 movs r3, 0x3 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r1, _0810577C @@ -285132,7 +285132,7 @@ sub_81056F0: @ 81056F0 movs r1, 0x68 movs r2, 0x50 movs r3, 0x3 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -285182,7 +285182,7 @@ sub_8105784: @ 8105784 cmp r0, 0 bgt _081057D6 movs r0, 0x7 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 4 ldr r2, _081057E4 @@ -285233,7 +285233,7 @@ _08105800: .4byte 0x02000000 sub_8105804: @ 8105804 push {r4,r5,lr} movs r0, 0x7 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 4 ldr r1, _08105848 @@ -285253,7 +285253,7 @@ _08105824: lsls r0, 2 ldr r1, _08105850 adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -285275,7 +285275,7 @@ sub_8105854: @ 8105854 movs r1, 0xA8 movs r2, 0x50 movs r3, 0x6 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r2, _0810588C @@ -285322,7 +285322,7 @@ sub_81058A0: @ 81058A0 lsls r0, 2 ldr r1, _081058C0 adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite pop {r0} bx r0 .align 2, 0 @@ -285350,7 +285350,7 @@ _081058D6: ldr r0, _08105944 movs r2, 0x44 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r3, r0, 4 @@ -285467,7 +285467,7 @@ _081059BE: lsls r0, 2 ldr r1, _081059E4 adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -285488,7 +285488,7 @@ sub_81059E8: @ 81059E8 movs r1, 0xA8 movs r2, 0x3C movs r3, 0x8 - bl AddObjectToFront + bl CreateSprite adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -285508,7 +285508,7 @@ sub_81059E8: @ 81059E8 movs r2, 0x3 orrs r1, r2 strb r1, [r0, 0x1] - bl obj_alloc_rotscale_entry + bl InitSpriteAffineAnim ldr r0, _08105A34 adds r0, 0x43 strb r4, [r0] @@ -285634,9 +285634,9 @@ sub_8105AEC: @ 8105AEC ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite pop {r4} pop {r0} bx r0 @@ -285657,7 +285657,7 @@ sub_8105B1C: @ 8105B1C asrs r2, 16 adds r1, r3, 0 movs r3, 0xC - bl AddObjectToFront + bl CreateSprite adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -285677,7 +285677,7 @@ sub_8105B1C: @ 8105B1C movs r2, 0x3 orrs r1, r2 strb r1, [r0, 0x1] - bl obj_alloc_rotscale_entry + bl InitSpriteAffineAnim adds r0, r4, 0 pop {r4} pop {r1} @@ -285717,9 +285717,9 @@ sub_8105B88: @ 8105B88 ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite pop {r4} pop {r0} bx r0 @@ -285783,7 +285783,7 @@ sub_8105BF8: @ 8105BF8 lsls r2, 16 asrs r2, 16 movs r3, 0x10 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 adds r7, r0, 0 @@ -285806,7 +285806,7 @@ sub_8105BF8: @ 8105BF8 cmp r1, 0 beq _08105C50 adds r0, r2, 0 - bl SetSpriteOamTables_NoPriorityFromTable + bl SetSubspriteTables _08105C50: adds r0, r7, 0 pop {r4-r7} @@ -286089,7 +286089,7 @@ _08105E3C: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] @@ -286325,7 +286325,7 @@ _08105FAE: strb r0, [r2] adds r0, r4, 0 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r2, _08105FFC ldrh r1, [r4, 0x30] lsls r0, r1, 4 @@ -286374,7 +286374,7 @@ _08106016: strb r0, [r4, 0x1] adds r0, r4, 0 movs r1, 0 - bl StartObjectImageAnim + bl StartSpriteAnim _0810604E: pop {r4} pop {r0} @@ -286396,7 +286396,7 @@ sub_8106058: @ 8106058 adds r0, r1 ldr r4, [r0] movs r0, 0x6 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag adds r1, r0, 0 lsls r1, 24 lsrs r1, 4 @@ -286430,7 +286430,7 @@ _081060A8: adds r0, r1 ldr r4, [r0] movs r0, 0x6 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag adds r1, r0, 0 lsls r1, 24 lsrs r1, 4 @@ -286454,7 +286454,7 @@ _081060A8: _081060E4: adds r0, r5, 0 movs r1, 0x1 - bl StartObjectImageAnimIfDifferent + bl StartSpriteAnimIfDifferent movs r0, 0 strh r0, [r5, 0x3C] pop {r4,r5} @@ -286789,7 +286789,7 @@ _0810634A: bx r0 .align 2, 0 _08106354: .4byte 0x02000000 -_08106358: .4byte nullsub_2 +_08106358: .4byte SpriteCallbackDummy _0810635C: .4byte 0x0000c0e0 thumb_func_end sub_8106230 @@ -286814,7 +286814,7 @@ sub_8106370: @ 8106370 ldr r0, _08106398 ldr r4, [r0] movs r0, 0x6 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag adds r1, r0, 0 lsls r1, 24 lsrs r1, 4 @@ -286868,9 +286868,9 @@ sub_81063C0: @ 81063C0 adds r1, r4, 0 bl sub_800D238 ldr r0, _081063FC - bl LoadObjectPics + bl LoadSpriteSheets ldr r0, _08106400 - bl LoadTaggedObjectPalettes + bl LoadSpritePalettes pop {r4} pop {r0} bx r0 @@ -286908,7 +286908,7 @@ _08106414: cmp r2, 0x3F bls _08106410 adds r0, r5, 0 - bl LoadObjectPic + bl LoadSpriteSheet pop {r4,r5} pop {r0} bx r0 @@ -287276,7 +287276,7 @@ _081066F2: orrs r0, r7 str r0, [r1, 0x8] ldr r0, [r1, 0x8] - bl ResetAllObjectData + bl ResetSpriteData ldr r1, _0810672C ldr r2, _08106730 adds r1, r2 @@ -287721,8 +287721,8 @@ _08106AA8: .4byte 0x0400004c sub_8106AAC: @ 8106AAC push {lr} bl sub_8106A58 - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -294613,8 +294613,8 @@ _08109E68: .4byte gUnknown_083F76C4 thumb_func_start sub_8109E6C sub_8109E6C: @ 8109E6C push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -294701,9 +294701,9 @@ sub_8109E80: @ 8109E80 bl LZ77UnCompVram bl remove_some_task bl ResetTasks - bl ResetAllObjectData + bl ResetSpriteData bl sub_8073B94 - bl ResetObjectPaletteAllocator + bl FreeAllSpritePalettes ldr r0, _0810A0BC movs r1, 0 movs r2, 0x40 @@ -294713,7 +294713,7 @@ sub_8109E80: @ 8109E80 ldr r0, _0810A0C4 bl LoadCompressedObjectPic ldr r0, _0810A0C8 - bl LoadTaggedObjectPalettes + bl LoadSpritePalettes ldr r0, _0810A0CC bl ShowBg ldr r0, _0810A0D0 @@ -294799,7 +294799,7 @@ sub_8109E80: @ 8109E80 movs r1, 0x78 movs r2, 0x38 movs r3, 0x2 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r1, _0810A110 @@ -294815,7 +294815,7 @@ sub_8109E80: @ 8109E80 ldrb r2, [r5, 0x1] adds r0, r6, 0 movs r3, 0x2 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -294829,7 +294829,7 @@ sub_8109E80: @ 8109E80 ldrb r2, [r5, 0x3] adds r0, r6, 0 movs r3, 0x2 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -294843,7 +294843,7 @@ sub_8109E80: @ 8109E80 ldrb r2, [r5, 0x5] adds r0, r6, 0 movs r3, 0x2 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -294904,8 +294904,8 @@ _0810A118: .4byte gUnknown_083F76B8 sub_810A11C: @ 810A11C push {lr} bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r0} bx r0 @@ -294992,7 +294992,7 @@ sub_810A178: @ 810A178 adds r1, r5, 0 adds r2, r4, 0 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0xC] @@ -295213,16 +295213,16 @@ _0810A37C: adds r4, r6 ldrb r0, [r4, 0x5] lsrs r0, 4 - bl gpu_pal_tag_by_index + bl GetSpritePaletteTagByPaletteNum lsls r0, 16 lsrs r0, 16 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldrb r0, [r5, 0xC] lsls r4, r0, 4 adds r4, r0 @@ -295231,9 +295231,9 @@ _0810A37C: ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r0, _0810A3F0 str r0, [r5] _0810A3E2: @@ -295492,7 +295492,7 @@ sub_810A580: @ 810A580 mov r1, r8 mov r2, r9 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r4, _0810A624 @@ -295595,14 +295595,14 @@ sub_810A68C: @ 810A68C bne _0810A6B8 adds r0, r3, 0 movs r1, 0x1 - bl StartObjectImageAnimIfDifferent + bl StartSpriteAnimIfDifferent b _0810A6C0 .align 2, 0 _0810A6B4: .4byte 0x03004b20 _0810A6B8: adds r0, r3, 0 movs r1, 0 - bl StartObjectImageAnimIfDifferent + bl StartSpriteAnimIfDifferent _0810A6C0: pop {r0} bx r0 @@ -295651,8 +295651,8 @@ _0810A700: thumb_func_start sub_810A704 sub_810A704: @ 810A704 push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -295784,13 +295784,13 @@ _0810A80C: _0810A816: bl remove_some_task bl ResetTasks - bl ResetAllObjectData + bl ResetSpriteData bl sub_8073B94 - bl ResetObjectPaletteAllocator + bl FreeAllSpritePalettes ldr r0, _0810A854 bl LoadCompressedObjectPic ldr r0, _0810A858 - bl LoadTaggedObjectPalettes + bl LoadSpritePalettes ldr r0, _0810A85C bl ShowBg ldr r0, _0810A860 @@ -295910,7 +295910,7 @@ Cb2_StartWallClock: @ 810A8F4 movs r1, 0x78 movs r2, 0x50 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r1, _0810AA04 @@ -295940,7 +295940,7 @@ Cb2_StartWallClock: @ 810A8F4 movs r1, 0x78 movs r2, 0x50 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -295962,7 +295962,7 @@ Cb2_StartWallClock: @ 810A8F4 movs r1, 0x78 movs r2, 0x50 movs r3, 0x2 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -295976,7 +295976,7 @@ Cb2_StartWallClock: @ 810A8F4 movs r1, 0x78 movs r2, 0x50 movs r3, 0x2 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -296052,7 +296052,7 @@ _0810AA70: movs r1, 0x78 movs r2, 0x50 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r6, _0810AB2C @@ -296081,7 +296081,7 @@ _0810AA70: movs r1, 0x78 movs r2, 0x50 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -296103,7 +296103,7 @@ _0810AA70: movs r1, 0x78 movs r2, 0x50 movs r3, 0x2 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -296117,7 +296117,7 @@ _0810AA70: movs r1, 0x78 movs r2, 0x50 movs r3, 0x2 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -296147,8 +296147,8 @@ _0810AB38: .4byte gUnknown_083F7B40 sub_810AB3C: @ 810AB3C push {lr} bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r0} bx r0 @@ -296881,7 +296881,7 @@ _0810B098: lsrs r3, 16 str r1, [sp] movs r0, 0 - bl SetSpriteTransformationMatrix + bl SetOamMatrix ldr r1, _0810B0F0 lsls r2, r7, 1 adds r0, r2, r1 @@ -296961,7 +296961,7 @@ _0810B130: lsrs r3, 16 str r1, [sp] movs r0, 0x1 - bl SetSpriteTransformationMatrix + bl SetOamMatrix ldr r1, _0810B188 lsls r2, r7, 1 adds r0, r2, r1 @@ -297401,7 +297401,7 @@ _0810B468: ldr r1, _0810B4C0 adds r0, r1 ldrb r1, [r6, 0x8] - bl StartObjectImageAnim + bl StartSpriteAnim movs r0, 0x6 bl FieldEffectActiveListRemove ldr r1, _0810B4C4 @@ -297647,8 +297647,8 @@ _0810B670: .4byte 0x03004b20 thumb_func_start sub_810B674 sub_810B674: @ 810B674 push {lr} - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl RunTasks bl fade_and_return_progress_probably pop {r0} @@ -297658,8 +297658,8 @@ sub_810B674: @ 810B674 thumb_func_start sub_810B68C sub_810B68C: @ 810B68C push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram ldr r1, _0810B6B0 ldr r2, _0810B6B4 @@ -297758,7 +297758,7 @@ _0810B780: .4byte 0x0202f388 _0810B784: .4byte 0x03001770 _0810B788: .4byte 0x0000043c _0810B78C: - bl ResetAllObjectData + bl ResetSpriteData b _0810B91C _0810B792: ldr r0, _0810B7A8 @@ -298100,7 +298100,7 @@ sub_810BA50: @ 810BA50 asrs r5, 16 adds r1, r4, 0 adds r2, r5, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 pop {r4,r5} @@ -299921,7 +299921,7 @@ _0810C8F2: ldr r0, _0810C914 str r0, [r4, 0x10] adds r0, r4, 0 - bl obj_alloc_rotscale_entry + bl InitSpriteAffineAnim movs r0, 0x1 strh r0, [r4, 0x2E] strh r5, [r4, 0x30] @@ -299947,7 +299947,7 @@ _0810C918: ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix ldr r0, _0810C94C str r0, [r4, 0x1C] _0810C944: @@ -299955,7 +299955,7 @@ _0810C944: pop {r0} bx r0 .align 2, 0 -_0810C94C: .4byte nullsub_2 +_0810C94C: .4byte SpriteCallbackDummy thumb_func_end sub_810C8D4 thumb_func_start sub_810C950 @@ -300392,8 +300392,8 @@ _0810CC50: .4byte gUnknown_081B694A sub_810CC54: @ 810CC54 push {lr} bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r0} bx r0 @@ -300402,8 +300402,8 @@ sub_810CC54: @ 810CC54 thumb_func_start sub_810CC6C sub_810CC6C: @ 810CC6C push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -300467,7 +300467,7 @@ sub_810CC80: @ 810CC80 ldr r0, [r1, 0x8] bl sub_8073B94 bl ResetTasks - bl ResetAllObjectData + bl ResetSpriteData ldr r3, _0810CD48 ldrh r2, [r3] strh r4, [r3] @@ -307989,10 +307989,10 @@ _081106C8: adds r0, r2, 0 strh r0, [r1] bl sub_8073B94 - bl ResetAllObjectData + bl ResetSpriteData bl ResetTasks - bl FreeAllObjectTiles - bl ResetObjectPaletteAllocator + bl FreeAllSpriteTiles + bl FreeAllSpritePalettes ldr r0, _08110710 movs r1, 0 strh r1, [r0] @@ -308105,8 +308105,8 @@ _081107D8: .4byte 0x0000043c thumb_func_start sub_81107DC sub_81107DC: @ 81107DC push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -308119,8 +308119,8 @@ sub_81107F0: @ 81107F0 ldr r0, [r0] bl _call_via_r0 bl sub_8111110 - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r0} bx r0 @@ -309770,8 +309770,8 @@ _08111480: .4byte 0x0000fff8 _08111484: .4byte 0x0400001a _08111488: bl sub_8073B94 - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes b _08111540 _08111496: ldr r4, _081114B4 @@ -310006,9 +310006,9 @@ sub_8111658: @ 8111658 mov r7, r8 push {r7} ldr r0, _08111720 - bl LoadObjectPic + bl LoadSpriteSheet ldr r0, _08111724 - bl LoadTaggedObjectPalette + bl LoadSpritePalette movs r5, 0 movs r1, 0 ldr r0, _08111728 @@ -310053,7 +310053,7 @@ _08111680: adds r2, r0 ldr r0, _08111730 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -310115,9 +310115,9 @@ _08111734: .4byte 0x02020004 sub_8111738: @ 8111738 push {r4-r6,lr} movs r0, 0x2 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag movs r0, 0x2 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag movs r4, 0 ldr r1, _081117A4 movs r2, 0xDC @@ -310135,7 +310135,7 @@ _0811175A: adds r1, r6, r2 adds r0, r1 ldr r0, [r0] - bl RemoveObjectAndFreeTiles + bl DestroySprite adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -310144,9 +310144,9 @@ _0811175A: bcc _0811175A _08111776: movs r0, 0x3 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag movs r0, 0x3 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag movs r4, 0 ldr r5, _081117A8 _08111786: @@ -310155,7 +310155,7 @@ _08111786: ldr r0, [r0] cmp r0, 0 beq _08111794 - bl RemoveObjectAndFreeTiles + bl DestroySprite _08111794: adds r0, r4, 0x1 lsls r0, 16 @@ -310183,9 +310183,9 @@ sub_81117AC: @ 81117AC ldr r1, _081117DC bl LZ77UnCompWram mov r0, sp - bl LoadObjectPic + bl LoadSpriteSheet ldr r0, _081117E0 - bl LoadTaggedObjectPalette + bl LoadSpritePalette add sp, 0x8 pop {r0} bx r0 @@ -310237,7 +310237,7 @@ _08111820: ldr r0, _08111870 movs r2, 0x8C movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -310486,10 +310486,10 @@ evolution_cutscene: @ 8111984 strb r0, [r1] bl sub_800D6D4 bl sub_800DAB8 - bl ResetAllObjectData + bl ResetSpriteData bl remove_some_task bl ResetTasks - bl ResetObjectPaletteAllocator + bl FreeAllSpritePalettes ldr r0, _08111C44 movs r3, 0x4 strb r3, [r0] @@ -310556,7 +310556,7 @@ evolution_cutscene: @ 8111984 movs r1, 0x78 movs r2, 0x40 movs r3, 0x1E - bl AddObjectToFront + bl CreateSprite lsls r1, r0, 24 lsrs r2, r1, 24 ldr r3, _08111C68 @@ -310622,7 +310622,7 @@ evolution_cutscene: @ 8111984 movs r1, 0x78 movs r2, 0x40 movs r3, 0x1E - bl AddObjectToFront + bl CreateSprite lsls r1, r0, 24 lsrs r2, r1, 24 ldr r3, _08111C68 @@ -310724,7 +310724,7 @@ _08111C54: .4byte gMonFrontPicTable _08111C58: .4byte gUnknown_081E7C74 _08111C5C: .4byte gUnknown_081FAF4C _08111C60: .4byte 0x02024e8c -_08111C64: .4byte gDummyObjectRotScalAnimTable +_08111C64: .4byte gDummySpriteAffineAnimTable _08111C68: .4byte 0x02014800 _08111C6C: .4byte 0x02020004 _08111C70: .4byte nullsub_37 @@ -310825,8 +310825,8 @@ sub_8111C90: @ 8111C90 strb r0, [r1] bl sub_800D6D4 bl sub_800DAB8 - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes ldr r1, _08111E54 movs r0, 0x4 strb r0, [r1] @@ -310863,7 +310863,7 @@ sub_8111C90: @ 8111C90 movs r1, 0x78 movs r2, 0x40 movs r3, 0x1E - bl AddObjectToFront + bl CreateSprite lsls r2, r0, 24 lsrs r2, 24 mov r1, r9 @@ -310933,7 +310933,7 @@ _08111E58: .4byte gMonFrontPicTable _08111E5C: .4byte gUnknown_081E7C74 _08111E60: .4byte gUnknown_081FAF4C _08111E64: .4byte 0x02024e8c -_08111E68: .4byte gDummyObjectRotScalAnimTable +_08111E68: .4byte gDummySpriteAffineAnimTable _08111E6C: .4byte 0x02020004 _08111E70: .4byte nullsub_37 _08111E74: .4byte nullsub_73 @@ -310997,8 +310997,8 @@ _08111EEC: bl SetHBlankCallback movs r0, 0 bl SetVBlankCallback - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes ldr r1, _08111F3C movs r0, 0x4 strb r0, [r1] @@ -311138,7 +311138,7 @@ _08112048: movs r1, 0x78 movs r2, 0x40 movs r3, 0x1E - bl AddObjectToFront + bl CreateSprite ldr r1, _081120A0 lsls r2, r0, 24 lsrs r2, 24 @@ -311170,7 +311170,7 @@ _0811208E: b _081120D6 .align 2, 0 _08112098: .4byte 0x02024e8c -_0811209C: .4byte gDummyObjectRotScalAnimTable +_0811209C: .4byte gDummySpriteAffineAnimTable _081120A0: .4byte 0x02014800 _081120A4: .4byte 0x02020004 _081120A8: .4byte nullsub_37 @@ -311289,7 +311289,7 @@ sub_81120E4: @ 81120E4 movs r1, 0x78 movs r2, 0x40 movs r3, 0x1E - bl AddObjectToFront + bl CreateSprite lsls r1, r0, 24 lsrs r2, r1, 24 mov r1, r9 @@ -311366,7 +311366,7 @@ _08112248: .4byte gMonFrontPicTable _0811224C: .4byte gUnknown_081E7C74 _08112250: .4byte gUnknown_081FAF4C _08112254: .4byte 0x02024e8c -_08112258: .4byte gDummyObjectRotScalAnimTable +_08112258: .4byte gDummySpriteAffineAnimTable _0811225C: .4byte 0x02020004 _08112260: .4byte nullsub_37 _08112264: .4byte sub_8112FE8 @@ -311377,8 +311377,8 @@ _0811226C: .4byte sub_8112290 thumb_func_start sub_8112270 sub_8112270: @ 8112270 push {lr} - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer ldr r0, _0811228C bl sub_800374C bl fade_and_return_progress_probably @@ -311392,8 +311392,8 @@ _0811228C: .4byte 0x03004210 thumb_func_start sub_8112290 sub_8112290: @ 8112290 push {lr} - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer ldr r0, _081122B0 ldr r0, [r0] adds r0, 0x4 @@ -316899,8 +316899,8 @@ sub_8114FD4: @ 8114FD4 ldr r0, _08115058 ldrh r0, [r0] strh r0, [r1] - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram bl sub_8089668 pop {r0} @@ -316953,8 +316953,8 @@ sub_811505C: @ 811505C ldr r0, _081150D4 ldrh r0, [r0] strh r0, [r1] - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram bl sub_8089668 pop {r0} @@ -316998,8 +316998,8 @@ nullsub_24: @ 81150F8 sub_81150FC: @ 81150FC push {lr} bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer ldr r0, _08115120 adds r1, r0, 0 adds r1, 0xB8 @@ -317019,8 +317019,8 @@ _08115120: .4byte 0x02019000 sub_8115124: @ 8115124 push {r4,lr} sub sp, 0x4 - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram bl sub_8117434 ldr r2, _08115188 @@ -317376,7 +317376,7 @@ _0811543C: .4byte 0x03001770 _08115440: .4byte 0x0000043c _08115444: bl sub_8073B94 - bl ResetAllObjectData + bl ResetSpriteData bl ResetTasks ldr r1, _08115458 ldr r0, _0811545C @@ -317442,8 +317442,8 @@ _081154CC: _081154F4: .4byte 0x03001770 _081154F8: .4byte 0x0000043c _081154FC: - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer ldr r0, _08115550 ldr r1, _08115554 adds r0, r1 @@ -318708,7 +318708,7 @@ _08115F20: .4byte 0x03004b20 _08115F24: .4byte 0x030024d0 _08115F28: .4byte 0x02019000 _08115F2C: .4byte 0x02020004 -_08115F30: .4byte nullsub_2 +_08115F30: .4byte SpriteCallbackDummy _08115F34: movs r0, 0x1 movs r1, 0xFF @@ -320223,9 +320223,9 @@ sub_8116B40: @ 8116B40 strh r4, [r0] strh r4, [r1] bl sub_80F9368 - bl ResetObjectPaletteAllocator + bl FreeAllSpritePalettes bl sub_8073B94 - bl ResetAllObjectData + bl ResetSpriteData bl sub_80F9020 ldr r0, _08116BB0 strh r4, [r0] @@ -321847,9 +321847,9 @@ sub_8117838: @ 8117838 lsls r0, 24 cmp r0, 0 bne _08117884 - bl ResetObjectPaletteAllocator + bl FreeAllSpritePalettes ldr r0, _08117870 - bl LoadTaggedObjectPalettes + bl LoadSpritePalettes ldr r0, _08117874 ldr r4, _08117878 adds r1, r4, 0 @@ -321873,7 +321873,7 @@ _08117878: .4byte 0x02017000 _0811787C: .4byte gUnknown_083F90FC _08117880: .4byte gUnknown_083F9D3C _08117884: - bl ResetObjectPaletteAllocator + bl FreeAllSpritePalettes _08117888: pop {r4} pop {r0} @@ -321891,7 +321891,7 @@ sub_8117890: @ 8117890 ldrb r3, [r1] movs r1, 0x74 movs r2, 0x50 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 @@ -321958,7 +321958,7 @@ sub_8117900: @ 8117900 orrs r0, r1 str r0, [sp, 0x4] mov r0, sp - bl LoadObjectPic + bl LoadSpriteSheet ldr r4, _08117A58 ldr r0, [r4] adds r1, r5, 0 @@ -321969,7 +321969,7 @@ sub_8117900: @ 8117900 ldrh r0, [r4, 0x6] strh r0, [r6, 0x6] mov r0, sp - bl LoadObjectPic + bl LoadSpriteSheet movs r7, 0 ldr r0, _08117A5C adds r0, r5 @@ -321993,7 +321993,7 @@ _0811795C: adds r2, r4, 0 adds r2, 0x5C movs r3, 0x1E - bl AddObjectToFront + bl CreateSprite adds r1, r6, 0 adds r1, 0x1D adds r1, r5, r1 @@ -322042,7 +322042,7 @@ _081179BA: asrs r1, 16 movs r2, 0x46 movs r3, 0x1E - bl AddObjectToFront + bl CreateSprite adds r1, r7, 0 adds r1, 0x29 adds r1, r5 @@ -322077,7 +322077,7 @@ _08117A00: asrs r2, 16 movs r1, 0x7E movs r3, 0x1E - bl AddObjectToFront + bl CreateSprite adds r1, r7, 0 adds r1, 0x2D adds r1, r5 @@ -322132,7 +322132,7 @@ _08117A7A: lsls r0, 2 ldr r1, _08117AA4 adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -322304,7 +322304,7 @@ _08117BCC: movs r1, 0x74 movs r2, 0x14 movs r3, 0xA - bl AddObjectToFront + bl CreateSprite adds r3, r5, 0 adds r3, 0x31 add r3, r8 @@ -322352,7 +322352,7 @@ _08117BCC: lsls r0, 2 adds r0, r4 movs r1, 0x8 - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -322598,7 +322598,7 @@ sub_8117DF4: @ 8117DF4 ldrh r1, [r4, 0x4] orrs r1, r2 str r1, [r0, 0x4] - bl LoadObjectPic + bl LoadSpriteSheet movs r1, 0xF mov r0, sp strh r1, [r0] @@ -322766,7 +322766,7 @@ _08117F3A: orrs r0, r2 str r0, [r6, 0x4] mov r0, sp - bl LoadObjectPic + bl LoadSpriteSheet adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -322776,7 +322776,7 @@ _08117F3A: movs r1, 0xD0 movs r2, 0x10 movs r3, 0x4 - bl AddObjectToFront + bl CreateSprite ldr r4, _081180DC adds r1, r4, 0 adds r1, 0x50 @@ -322804,7 +322804,7 @@ _08117FA2: ldr r0, _081180E4 movs r2, 0x18 movs r3, 0 - bl AddObjectToFront + bl CreateSprite adds r3, r5, 0 adds r3, 0x15 adds r3, r4 @@ -322838,7 +322838,7 @@ _08117FA2: movs r1, 0x78 movs r2, 0x44 movs r3, 0x4 - bl AddObjectToFront + bl CreateSprite ldr r3, _081180DC adds r1, r3, 0 adds r1, 0x55 @@ -322866,7 +322866,7 @@ _08118020: ldr r0, _081180EC movs r2, 0x24 movs r3, 0x4 - bl AddObjectToFront + bl CreateSprite adds r2, r5, 0 adds r2, 0x1A add r2, r8 @@ -322900,7 +322900,7 @@ _08118020: movs r1, 0x98 movs r2, 0x60 movs r3, 0x9 - bl AddObjectToFront + bl CreateSprite ldr r3, _081180DC adds r3, 0x6C strb r0, [r3] @@ -323481,12 +323481,12 @@ sub_81184D8: @ 81184D8 orrs r0, r1 str r0, [sp, 0x4] mov r0, sp - bl LoadObjectPic + bl LoadSpriteSheet ldr r0, _0811854C movs r1, 0x74 movs r2, 0x50 movs r3, 0x51 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r2, _08118550 @@ -323562,7 +323562,7 @@ _08118584: ldr r0, _081185E4 movs r1, 0x74 movs r2, 0x50 - bl AddObjectToFront + bl CreateSprite adds r3, r4, r6 strb r0, [r3] lsls r0, 24 @@ -323639,7 +323639,7 @@ _0811860A: ldr r1, _08118668 str r1, [r2] movs r1, 0 - bl StartObjectImageAnim + bl StartSpriteAnim movs r1, 0 adds r2, r5, 0x1 adds r3, r6, 0x1 @@ -323670,7 +323670,7 @@ _08118632: .align 2, 0 _08118660: .4byte 0x02019000 _08118664: .4byte 0x02020004 -_08118668: .4byte nullsub_2 +_08118668: .4byte SpriteCallbackDummy thumb_func_end sub_81185E8 thumb_func_start sub_811866C @@ -324030,7 +324030,7 @@ _08118926: lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r5, 0 bl sub_81186B8 movs r0, 0x1E @@ -324293,7 +324293,7 @@ sub_8118B30: @ 8118B30 lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r5, 0 bl sub_81186B8 movs r0, 0x1E @@ -324554,7 +324554,7 @@ _08118D50: lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r5, 0 bl sub_81186B8 movs r0, 0x1E @@ -324639,7 +324639,7 @@ sub_8118DE4: @ 8118DE4 lsls r1, 24 lsrs r1, 24 adds r0, r7, 0 - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r7, 0 bl sub_81186B8 movs r0, 0x1E @@ -325127,7 +325127,7 @@ sub_8119224: @ 8119224 negs r2, r2 movs r1, 0x24 movs r3, 0x32 - bl AddObjectToFront + bl CreateSprite adds r1, r5, 0 adds r1, 0x73 strb r0, [r1] @@ -325146,7 +325146,7 @@ sub_8119224: @ 8119224 ldrsh r2, [r0, r3] adds r0, r4, 0 movs r3, 0x3B - bl AddObjectToFront + bl CreateSprite adds r1, r5, 0 adds r1, 0x74 strb r0, [r1] @@ -325155,7 +325155,7 @@ sub_8119224: @ 8119224 movs r1, 0x24 movs r2, 0x8C movs r3, 0x33 - bl AddObjectToFront + bl CreateSprite adds r1, r5, 0 adds r1, 0x75 strb r0, [r1] @@ -325347,7 +325347,7 @@ sub_81193D4: @ 81193D4 movs r3, 0 ldrsh r2, [r2, r3] movs r3, 0x32 - bl AddObjectToFront + bl CreateSprite ldr r6, _0811951C adds r1, r6, 0 adds r1, 0x73 @@ -325361,7 +325361,7 @@ sub_81193D4: @ 81193D4 ldrh r1, [r7, 0x2E] lsls r1, 24 lsrs r1, 24 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r0, _08119524 movs r1, 0x2E ldrsh r2, [r7, r1] @@ -325374,7 +325374,7 @@ sub_81193D4: @ 81193D4 movs r3, 0 ldrsh r2, [r4, r3] movs r3, 0x33 - bl AddObjectToFront + bl CreateSprite adds r4, r6, 0 adds r4, 0x74 strb r0, [r4] @@ -325814,7 +325814,7 @@ sub_8119780: @ 8119780 strb r0, [r4, 0x3] _081197BA: adds r0, r2, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r0, 0 strb r0, [r4, 0x1] ldr r0, _081197D4 @@ -325915,7 +325915,7 @@ _0811985C: ands r1, r2 strb r1, [r0] adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _08119884: add sp, 0x18 pop {r4} @@ -326169,7 +326169,7 @@ _08119A78: _08119A80: .4byte gUnknown_083F8DF4 _08119A84: .4byte 0x02020004 _08119A88: .4byte sub_8119898 -_08119A8C: .4byte nullsub_2 +_08119A8C: .4byte SpriteCallbackDummy thumb_func_end sub_8119964 thumb_func_start sub_8119A90 @@ -326220,7 +326220,7 @@ _08119AC4: movs r0, 0x5E bl m4aSongNumStop adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r5, _08119B1C ldr r4, _08119B20 adds r4, 0x74 @@ -326232,19 +326232,19 @@ _08119AC4: ldrb r0, [r0, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r5 - bl RemoveObjectAndFreeTiles + bl DestroySprite _08119B12: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08119B18: .4byte nullsub_2 +_08119B18: .4byte SpriteCallbackDummy _08119B1C: .4byte 0x02020004 _08119B20: .4byte 0x02019000 thumb_func_end sub_8119AAC @@ -326312,7 +326312,7 @@ _08119B84: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r0, _08119BC4 str r0, [r4, 0x1C] ldr r2, _08119BC8 @@ -326471,7 +326471,7 @@ _08119CDC: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim movs r0, 0x2D strh r0, [r4, 0x30] ldr r0, _08119D04 @@ -327478,9 +327478,9 @@ _0811A450: _0811A490: .4byte gUnknown_083FAE7C _0811A494: ldr r0, _0811A4E8 - bl LoadObjectPics + bl LoadSpriteSheets ldr r0, _0811A4EC - bl LoadTaggedObjectPalettes + bl LoadSpritePalettes ldr r0, _0811A4F0 ldrb r1, [r4, 0x4] lsls r1, 19 @@ -327495,7 +327495,7 @@ _0811A494: adds r2, r3 asrs r2, 16 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite ldr r1, _0811A4F4 lsls r0, 24 lsrs r0, 24 @@ -327536,16 +327536,16 @@ sub_811A4F8: @ 811A4F8 adds r0, r5 ldrb r0, [r0, 0x5] lsrs r0, 4 - bl gpu_pal_tag_by_index + bl GetSpritePaletteTagByPaletteNum lsls r0, 16 lsrs r0, 16 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag ldrh r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r5 - bl RemoveObjectAndFreeTiles + bl DestroySprite pop {r4,r5} pop {r0} bx r0 @@ -327727,7 +327727,7 @@ _0811A63C: ldrh r0, [r4, 0x6] str r0, [sp] movs r0, 0 - bl SetSpriteTransformationMatrix + bl SetOamMatrix ldr r2, _0811A6D4 movs r0, 0 ldrsb r0, [r5, r0] @@ -329867,7 +329867,7 @@ sub_811B6B4: @ 811B6B4 movs r3, 0x4 ldrsh r2, [r5, r3] movs r3, 0 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 ldr r1, _0811B718 @@ -329894,10 +329894,10 @@ sub_811B6B4: @ 811B6B4 ldr r0, _0811B71C strh r0, [r4, 0x32] adds r0, r4, 0 - bl obj_alloc_rotscale_entry + bl InitSpriteAffineAnim ldrb r1, [r5, 0x8] adds r0, r4, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim movs r0, 0 pop {r4,r5} pop {r1} @@ -332120,7 +332120,7 @@ sub_811C7B0: @ 811C7B0 ldrb r0, [r6, 0x1] orrs r0, r1 strb r0, [r6, 0x1] - bl rotscale_alloc_entry + bl AllocOamMatrix lsls r0, 24 lsrs r0, 24 movs r3, 0x1F @@ -332135,7 +332135,7 @@ sub_811C7B0: @ 811C7B0 ands r1, r2 orrs r1, r0 strb r1, [r5, 0x3] - bl rotscale_alloc_entry + bl AllocOamMatrix lsls r0, 24 lsrs r0, 24 mov r1, r9 @@ -332167,12 +332167,12 @@ sub_811C7B0: @ 811C7B0 movs r1, 0x1 movs r2, 0x3 movs r3, 0x3 - bl CalcVecFromObjectCenterToObjectUpperLeft + bl CalcCenterToCornerVec adds r0, r6, 0 movs r1, 0x1 movs r2, 0x3 movs r3, 0x3 - bl CalcVecFromObjectCenterToObjectUpperLeft + bl CalcCenterToCornerVec ldrb r0, [r5, 0x3] lsls r0, 26 lsrs r0, 27 @@ -332187,7 +332187,7 @@ sub_811C7B0: @ 811C7B0 movs r4, 0 ldrsh r2, [r3, r4] movs r3, 0 - bl sub_8002228 + bl SetOamMatrixRotationScaling ldrb r0, [r6, 0x3] lsls r0, 26 lsrs r0, 27 @@ -332195,7 +332195,7 @@ sub_811C7B0: @ 811C7B0 movs r2, 0x80 lsls r2, 2 movs r3, 0 - bl sub_8002228 + bl SetOamMatrixRotationScaling add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -332841,7 +332841,7 @@ sub_811CDA0: @ 811CDA0 movs r4, 0 _0811CDB4: ldr r0, _0811CE0C - bl obj_add_empty_with_callback + bl CreateInvisibleSprite lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -333219,7 +333219,7 @@ _0811D09E: adds r0, 0x1 strh r0, [r4, 0x20] adds r0, r3, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _0811D0AA: pop {r4-r6} pop {r0} @@ -333999,8 +333999,8 @@ _0811D678: .4byte 0x0200c014 thumb_func_start sub_811D67C sub_811D67C: @ 811D67C push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -334639,7 +334639,7 @@ _0811DB08: _0811DB0C: .4byte 0x02020004 _0811DB10: .4byte 0x02024be0 _0811DB14: .4byte 0x02024a60 -_0811DB18: .4byte nullsub_2 +_0811DB18: .4byte SpriteCallbackDummy thumb_func_end sub_811DAE4 thumb_func_start sub_811DB1C @@ -334670,7 +334670,7 @@ sub_811DB1C: @ 811DB1C adds r0, r1 lsls r0, 2 adds r0, r6 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -334678,7 +334678,7 @@ sub_811DB1C: @ 811DB1C adds r0, r1 lsls r0, 2 adds r0, r6 - bl RemoveObjectAndFreeTiles + bl DestroySprite bl dp01_tbl3_exec_completed _0811DB6C: pop {r4-r6} @@ -334688,7 +334688,7 @@ _0811DB6C: _0811DB74: .4byte 0x02020004 _0811DB78: .4byte 0x02024be0 _0811DB7C: .4byte 0x02024a60 -_0811DB80: .4byte nullsub_2 +_0811DB80: .4byte SpriteCallbackDummy thumb_func_end sub_811DB1C thumb_func_start sub_811DB84 @@ -334764,7 +334764,7 @@ _0811DC04: .4byte 0x020239f8 _0811DC08: .4byte 0x02020004 _0811DC0C: .4byte 0x03004340 _0811DC10: .4byte 0x02024a60 -_0811DC14: .4byte nullsub_2 +_0811DC14: .4byte SpriteCallbackDummy _0811DC18: ldr r2, _0811DC84 ldr r5, _0811DC88 @@ -334827,7 +334827,7 @@ _0811DC7E: _0811DC84: .4byte 0x02020004 _0811DC88: .4byte 0x03004340 _0811DC8C: .4byte 0x02024a60 -_0811DC90: .4byte nullsub_2 +_0811DC90: .4byte SpriteCallbackDummy _0811DC94: .4byte 0x02017810 _0811DC98: .4byte 0x03004330 _0811DC9C: .4byte sub_811DB84 @@ -334896,7 +334896,7 @@ sub_811DCA0: @ 811DCA0 lsls r0, 2 ldr r1, _0811DDCC adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r4, _0811DDD0 ldrb r0, [r6] adds r1, r7, 0 @@ -334932,7 +334932,7 @@ _0811DD56: lsls r0, 2 ldr r1, _0811DDCC adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r5, _0811DDD0 ldrb r1, [r4] adds r0, r1, r5 @@ -335113,7 +335113,7 @@ sub_811DE98: @ 811DE98 ldrb r0, [r0, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -335121,7 +335121,7 @@ sub_811DE98: @ 811DE98 adds r0, r1 lsls r0, 2 adds r0, r6 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r1, _0811DF30 ldrb r0, [r4] adds r0, r1 @@ -335164,7 +335164,7 @@ sub_811DF34: @ 811DF34 lsls r0, 2 ldr r4, _0811DF98 adds r0, r4 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] @@ -335172,7 +335172,7 @@ sub_811DF34: @ 811DF34 adds r0, r1 lsls r0, 2 adds r0, r4 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r1, _0811DF9C ldrb r0, [r6] adds r0, r1 @@ -335316,7 +335316,7 @@ _0811E07C: _0811E084: .4byte 0x02020004 _0811E088: .4byte 0x03004340 _0811E08C: .4byte 0x02024a60 -_0811E090: .4byte nullsub_2 +_0811E090: .4byte SpriteCallbackDummy _0811E094: .4byte 0x02017800 _0811E098: .4byte 0x03004330 _0811E09C: .4byte sub_811E0A0 @@ -335379,9 +335379,9 @@ sub_811E0CC: @ 811E0CC strb r0, [r1, 0x1] ldr r4, _0811E198 adds r0, r4, 0 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag adds r0, r4, 0 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag ldr r0, _0811E19C movs r1, 0xA bl CreateTask @@ -335406,7 +335406,7 @@ sub_811E0CC: @ 811E0CC ldr r1, _0811E1AC adds r0, r1 movs r1, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r4, _0811E1B0 ldrb r1, [r7] adds r0, r1, r4 @@ -335502,7 +335502,7 @@ _0811E1EA: cmp r0, 0 bne _0811E22C adds r0, r3, r5 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r1, _0811E250 ldrb r0, [r4] lsls r0, 2 @@ -335520,7 +335520,7 @@ _0811E23C: .4byte 0x02024a6a _0811E240: .4byte 0x03004360 _0811E244: .4byte 0x02020004 _0811E248: .4byte 0x0300434c -_0811E24C: .4byte nullsub_2 +_0811E24C: .4byte SpriteCallbackDummy _0811E250: .4byte 0x03004330 _0811E254: .4byte sub_811E0CC thumb_func_end sub_811E1BC @@ -338016,7 +338016,7 @@ sub_811F6D8: @ 811F6D8 mov r0, r8 adds r1, r5, 0 adds r2, r4, 0 - bl AddObjectToFront + bl CreateSprite ldr r4, _0811F7DC ldrb r1, [r6] adds r1, r4 @@ -338062,7 +338062,7 @@ sub_811F6D8: @ 811F6D8 ldr r1, _0811F7E8 adds r2, r1 ldrb r1, [r2] - bl StartObjectImageAnim + bl StartSpriteAnim ldr r1, _0811F7EC ldrb r0, [r6] lsls r0, 2 @@ -338208,7 +338208,7 @@ sub_811F864: @ 811F864 mov r0, r10 adds r1, r5, 0 adds r2, r4, 0 - bl AddObjectToFront + bl CreateSprite ldr r4, _0811F9C0 adds r4, r6, r4 strb r0, [r4] @@ -338253,7 +338253,7 @@ sub_811F864: @ 811F864 ldr r1, _0811F9C8 adds r6, r1 ldrb r1, [r6] - bl StartObjectImageAnim + bl StartSpriteAnim ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -338302,7 +338302,7 @@ _0811F9BC: .4byte 0x02024e8c _0811F9C0: .4byte 0x02024be0 _0811F9C4: .4byte 0x02020004 _0811F9C8: .4byte 0x02024e84 -_0811F9CC: .4byte nullsub_2 +_0811F9CC: .4byte SpriteCallbackDummy thumb_func_end sub_811F864 thumb_func_start sub_811F9D0 @@ -338345,7 +338345,7 @@ _0811FA14: lsls r0, 2 ldr r4, _0811FA54 adds r0, r4 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] @@ -338353,7 +338353,7 @@ _0811FA14: adds r0, r1 lsls r0, 2 adds r0, r4 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r1, _0811FA58 ldrb r0, [r6] adds r0, r1 @@ -338522,7 +338522,7 @@ _0811FB34: mov r0, r8 adds r1, r5, 0 adds r2, r4, 0 - bl AddObjectToFront + bl CreateSprite ldr r5, _0811FC18 ldrb r1, [r6] adds r1, r5 @@ -338677,7 +338677,7 @@ _0811FCCC: .4byte 0x02024a60 _0811FCD0: .4byte 0x02020004 _0811FCD4: .4byte 0x0000ffd8 _0811FCD8: .4byte sub_8078B34 -_0811FCDC: .4byte nullsub_2 +_0811FCDC: .4byte SpriteCallbackDummy _0811FCE0: .4byte 0x03004330 _0811FCE4: .4byte sub_811DB1C thumb_func_end sub_811FC3C @@ -339878,9 +339878,9 @@ sub_8120588: @ 8120588 lsls r0, 2 adds r0, r5 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r0, _081206F4 - bl AllocObjectPalette + bl AllocSpritePalette adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -345521,9 +345521,9 @@ _08123378: .4byte 0x000010fc _0812337C: .4byte 0x03001770 _08123380: .4byte 0x0000043c _08123384: - bl ResetAllObjectData + bl ResetSpriteData bl ResetTasks - bl ResetObjectPaletteAllocator + bl FreeAllSpritePalettes bl sub_8073B94 bl sub_807C828 movs r4, 0 @@ -345573,7 +345573,7 @@ _081233EC: cmp r4, 0x2 bls _081233EC ldr r0, _08123458 - bl LoadTaggedObjectPalettes + bl LoadSpritePalettes ldr r0, _0812345C ldr r4, _08123460 adds r1, r4, 0 @@ -345929,8 +345929,8 @@ _08123720: .4byte 0x02039274 mainloop: @ 8123724 push {lr} bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably bl sound_something pop {r0} @@ -345966,7 +345966,7 @@ _08123766: cmp r4, 0x13 bls _08123766 bl ResetTasks - bl ResetAllObjectData + bl ResetSpriteData bl sub_8073B94 ldr r2, _0812385C movs r3, 0x80 @@ -346618,8 +346618,8 @@ sub_8123C40: @ 8123C40 adds r1, 0x2 ldrb r0, [r2, 0x9] strh r0, [r1] - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r4} pop {r0} @@ -346942,7 +346942,7 @@ _08123F30: cmp r0, 0xA0 ble _08123F3E adds r0, r2, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _08123F3E: pop {r0} bx r0 @@ -347011,7 +347011,7 @@ _08123FAA: cmp r0, 0x4F bgt _08123FB8 adds r0, r2, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _08123FB8: pop {r0} bx r0 @@ -347273,7 +347273,7 @@ _081241BE: movs r1, 0xB0 movs r2, 0x2B movs r3, 0x67 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r6, r0, 24 ldr r5, _0812424C @@ -347293,7 +347293,7 @@ _081241BE: movs r1, 0xC8 movs r2, 0x63 movs r3, 0x65 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r6, r0, 24 lsls r0, r6, 4 @@ -347384,7 +347384,7 @@ _081242B8: movs r1, 0x68 movs r2, 0x9 movs r3, 0x67 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r6, r0, 24 ldr r5, _081243FC @@ -347404,7 +347404,7 @@ _081242B8: movs r1, 0x80 movs r2, 0x41 movs r3, 0x65 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r6, r0, 24 lsls r0, r6, 4 @@ -347442,7 +347442,7 @@ _08124322: asrs r2, 16 ldr r0, _0812440C movs r3, 0x68 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r6, r0, 24 lsls r0, r6, 4 @@ -347553,7 +347553,7 @@ _0812441A: adds r0, r4, 0 movs r1, 0x7 _08124428: - bl StartObjectImageAnim + bl StartSpriteAnim strh r7, [r4, 0x30] ldrh r0, [r4, 0x22] adds r0, 0x2 @@ -347563,7 +347563,7 @@ _08124436: adds r0, r4, 0 movs r1, 0x6 _0812443A: - bl StartObjectImageAnim + bl StartSpriteAnim strh r5, [r4, 0x30] _08124440: ldr r0, _08124468 @@ -352381,7 +352381,7 @@ SetUpReflection: @ 812680C str r0, [r7, 0x8] adds r0, r7, 0 movs r1, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r0, _081268CC str r0, [r7, 0x10] mov r1, r8 @@ -352423,8 +352423,8 @@ _081268B2: _081268BC: .4byte 0x02020004 _081268C0: .4byte sub_81269E0 _081268C4: .4byte gUnknown_0830FD14 -_081268C8: .4byte gDummyObjectImageAnimTable -_081268CC: .4byte gDummyObjectRotScalAnimTable +_081268C8: .4byte gDummySpriteAnimTable +_081268CC: .4byte gDummySpriteAffineAnimTable thumb_func_end SetUpReflection thumb_func_start sub_81268D0 @@ -352763,7 +352763,7 @@ sub_8126B54: @ 8126B54 movs r1, 0 movs r2, 0 movs r3, 0x52 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 @@ -352891,7 +352891,7 @@ _08126C0E: lsls r1, 24 lsrs r1, 24 adds r0, r2, 0 - bl StartObjectImageAnim + bl StartSpriteAnim _08126C5A: add sp, 0x4 pop {r3} @@ -352934,7 +352934,7 @@ oei_shadow: @ 8126C6C movs r1, 0 movs r2, 0 movs r3, 0x94 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -353104,7 +353104,7 @@ oei_grass_normal: @ 8126DD8 movs r3, 0 ldrsh r2, [r4, r3] movs r3, 0 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -353147,7 +353147,7 @@ oei_grass_normal: @ 8126DD8 beq _08126E64 adds r0, r3, 0 movs r1, 0x4 - bl SeekObjectImageAnim + bl SeekSpriteAnim _08126E64: movs r0, 0 add sp, 0x4 @@ -353310,7 +353310,7 @@ sub_8126F80: @ 8126F80 movs r3, 0x4 ldrsh r2, [r4, r3] movs r3, 0 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -353452,7 +353452,7 @@ sub_8127080: @ 8127080 movs r3, 0 ldrsh r2, [r4, r3] movs r3, 0 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -353496,7 +353496,7 @@ sub_8127080: @ 8127080 beq _08127110 adds r0, r4, 0 movs r1, 0x6 - bl SeekObjectImageAnim + bl SeekSpriteAnim _08127110: movs r0, 0 add sp, 0x4 @@ -353651,7 +353651,7 @@ sub_8127220: @ 8127220 movs r3, 0x4 ldrsh r2, [r4, r3] movs r3, 0 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -353712,7 +353712,7 @@ sub_8127290: @ 8127290 movs r1, 0 movs r2, 0 movs r3, 0 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -353855,7 +353855,7 @@ _081273BC: beq _081273D6 adds r0, r4, 0 movs r1, 0 - bl StartObjectImageAnim + bl StartSpriteAnim _081273D6: strh r7, [r4, 0x20] strh r5, [r4, 0x22] @@ -353915,7 +353915,7 @@ sub_8127428: @ 8127428 movs r3, 0x4 ldrsh r2, [r4, r3] ldrb r3, [r4, 0x8] - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -353944,7 +353944,7 @@ sub_8127428: @ 8127428 movs r1, 0xD strh r1, [r0, 0x3C] ldrb r1, [r4, 0x10] - bl StartObjectImageAnim + bl StartSpriteAnim _08127486: movs r0, 0 pop {r4} @@ -353972,7 +353972,7 @@ sub_812749C: @ 812749C movs r3, 0x4 ldrsh r2, [r4, r3] ldrb r3, [r4, 0x8] - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r1, r0, 24 adds r5, r1, 0 @@ -354002,7 +354002,7 @@ sub_812749C: @ 812749C movs r1, 0x18 strh r1, [r0, 0x3C] ldrb r1, [r4, 0x10] - bl StartObjectImageAnim + bl StartSpriteAnim _081274FC: adds r0, r5, 0 pop {r4,r5} @@ -354030,7 +354030,7 @@ sub_8127510: @ 8127510 movs r3, 0x4 ldrsh r2, [r4, r3] ldrb r3, [r4, 0x8] - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r1, r0, 24 adds r5, r1, 0 @@ -354060,7 +354060,7 @@ sub_8127510: @ 8127510 movs r1, 0x23 strh r1, [r0, 0x3C] ldrb r1, [r4, 0x10] - bl StartObjectImageAnim + bl StartSpriteAnim _08127570: adds r0, r5, 0 pop {r4,r5} @@ -354169,7 +354169,7 @@ sub_8127610: @ 8127610 movs r1, 0 movs r2, 0 movs r3, 0 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x40 @@ -354316,7 +354316,7 @@ sub_8127740: @ 8127740 movs r3, 0x4 ldrsh r2, [r4, r3] movs r3, 0 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -354373,7 +354373,7 @@ oei_water_drop_tall: @ 81277B0 movs r3, 0x4 ldrsh r2, [r4, r3] movs r3, 0 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -354434,7 +354434,7 @@ sub_8127820: @ 8127820 movs r1, 0 movs r2, 0 movs r3, 0 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x40 @@ -354486,7 +354486,7 @@ sub_8127820: @ 8127820 subs r1, 0x4 strh r1, [r0, 0x26] movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim _081278B6: movs r0, 0 pop {r4-r7} @@ -354594,7 +354594,7 @@ oei_ripples: @ 8127978 movs r3, 0x4 ldrsh r2, [r4, r3] ldrb r3, [r4, 0x8] - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -354653,7 +354653,7 @@ sub_81279D8: @ 81279D8 movs r1, 0 movs r2, 0 movs r3, 0 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -354810,7 +354810,7 @@ sub_8127B14: @ 8127B14 movs r3, 0x4 ldrsh r2, [r4, r3] ldrb r3, [r4, 0x8] - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -354865,7 +354865,7 @@ sub_8127B80: @ 8127B80 movs r3, 0x4 ldrsh r2, [r4, r3] ldrb r3, [r4, 0x8] - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -354920,7 +354920,7 @@ sub_8127BEC: @ 8127BEC movs r3, 0x4 ldrsh r2, [r4, r3] ldrb r3, [r4, 0x8] - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -354975,7 +354975,7 @@ sub_8127C58: @ 8127C58 movs r3, 0x4 ldrsh r2, [r4, r3] ldrb r3, [r4, 0x8] - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -355068,7 +355068,7 @@ oei_ash: @ 8127CF8 movs r3, 0 ldrsh r2, [r4, r3] ldrb r3, [r5, 0x8] - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -355245,7 +355245,7 @@ sub_8127E58: @ 8127E58 movs r3, 0x4 ldrsh r2, [r4, r3] movs r3, 0x96 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 @@ -355458,7 +355458,7 @@ sub_8127FD4: @ 8127FD4 add r0, sp ldrb r1, [r0] adds r0, r4, 0 - bl StartObjectImageAnimIfDifferent + bl StartSpriteAnimIfDifferent _08128000: add sp, 0x8 pop {r4,r5} @@ -355629,7 +355629,7 @@ sub_8128124: @ 8128124 movs r1, 0 movs r2, 0 movs r3, 0xFF - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 lsls r2, r0, 4 @@ -355654,7 +355654,7 @@ sub_8128124: @ 8128124 pop {r1} bx r1 .align 2, 0 -_08128168: .4byte gUnknown_081E2914 +_08128168: .4byte gDummySpriteTemplate _0812816C: .4byte 0x02020004 _08128170: .4byte sub_8128174 thumb_func_end sub_8128124 @@ -355713,7 +355713,7 @@ sub_81281B4: @ 81281B4 movs r3, 0x4 ldrsh r2, [r4, r3] movs r3, 0 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -355774,7 +355774,7 @@ sub_8128224: @ 8128224 movs r1, 0 movs r2, 0 movs r3, 0 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x40 @@ -355833,7 +355833,7 @@ sub_8128224: @ 8128224 subs r1, 0x2 strh r1, [r0, 0x26] movs r1, 0x2 - bl SeekObjectImageAnim + bl SeekSpriteAnim _081282C8: movs r0, 0 pop {r4-r7} @@ -355916,7 +355916,7 @@ _08128350: beq _0812836A adds r0, r4, 0 movs r1, 0 - bl StartObjectImageAnim + bl StartSpriteAnim _0812836A: strh r6, [r4, 0x20] strh r5, [r4, 0x22] @@ -355968,7 +355968,7 @@ sub_81283AC: @ 81283AC movs r3, 0x4 ldrsh r2, [r4, r3] movs r3, 0x52 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -356052,7 +356052,7 @@ sub_8128450: @ 8128450 movs r3, 0x4 ldrsh r2, [r4, r3] ldrb r3, [r4, 0x8] - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -356164,7 +356164,7 @@ _0812852C: movs r1, 0 movs r2, 0 movs r3, 0 - bl AddObjectToBack + bl CreateSpriteAtEnd mov r1, sp strb r0, [r1] lsls r0, 24 @@ -356309,7 +356309,7 @@ _081285DC: strh r0, [r5, 0x2E] adds r0, r5, 0 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim _0812865C: movs r3, 0x2E ldrsh r0, [r5, r3] @@ -356429,7 +356429,7 @@ sub_8128700: @ 8128700 movs r3, 0x4 ldrsh r2, [r4, r3] movs r3, 0x52 - bl AddObjectToBack + bl CreateSpriteAtEnd lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 @@ -362955,7 +362955,7 @@ _0812B680: _0812B684: .4byte 0x02020004 _0812B688: .4byte 0x02024be0 _0812B68C: .4byte 0x02024a60 -_0812B690: .4byte nullsub_2 +_0812B690: .4byte SpriteCallbackDummy thumb_func_end sub_812B65C thumb_func_start sub_812B694 @@ -363283,7 +363283,7 @@ sub_812B8B8: @ 812B8B8 asrs r2, 16 movs r1, 0x50 movs r3, 0x1E - bl AddObjectToFront + bl CreateSprite ldr r6, _0812B97C ldrb r1, [r5] adds r1, r6 @@ -364718,7 +364718,7 @@ _0812C3BE: strh r1, [r0] adds r0, r4, 0 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim movs r0, 0 strh r0, [r4, 0x32] adds r2, r4, 0 @@ -365610,7 +365610,7 @@ _0812CA76: _0812CA96: adds r0, r4, 0 movs r1, 0x1 - bl sub_8002068 + bl ChangeSpriteAffineAnim _0812CA9E: ldrh r0, [r4, 0x2E] adds r0, 0x1 @@ -366443,7 +366443,7 @@ _0812D0D4: subs r3, r4 lsls r3, 24 lsrs r3, 24 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r4, r0, 24 movs r0, 0x40 @@ -366503,7 +366503,7 @@ _0812D150: .align 2, 0 _0812D168: .4byte gUnknown_083D7220 _0812D16C: .4byte 0x02020004 -_0812D170: .4byte nullsub_2 +_0812D170: .4byte SpriteCallbackDummy _0812D174: .4byte gUnknown_08402400 _0812D178: adds r0, r6, 0 @@ -366580,7 +366580,7 @@ _0812D1DC: movs r1, 0x2 str r2, [sp] str r3, [sp, 0x4] - bl StartObjectImageAnim + bl StartSpriteAnim mov r0, r8 adds r1, r4, r0 ldr r0, _0812D234 @@ -366649,7 +366649,7 @@ sub_812D254: @ 812D254 subs r0, 0x1 strh r0, [r1] adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _0812D288: pop {r4} pop {r0} @@ -367028,7 +367028,7 @@ _0812D518: adds r3, 0x1 lsls r3, 24 lsrs r3, 24 - bl AddObjectAndAnimateForOneFrame + bl CreateSpriteAndAnimate _0812D564: movs r1, 0x20 ldrsh r0, [r4, r1] @@ -367172,7 +367172,7 @@ _0812D65E: cmp r0, 0x3C ble _0812D66C adds r0, r3, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _0812D66C: pop {r0} bx r0 @@ -367641,7 +367641,7 @@ _0812DA0A: lsls r0, 2 adds r0, r3 movs r1, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim _0812DA20: ldr r0, _0812DA44 mov r1, r9 @@ -368254,7 +368254,7 @@ _0812DED6: lsls r3, 24 lsrs r3, 24 adds r0, r4, 0 - bl AddObjectToFront + bl CreateSprite mov r9, r0 mov r1, r9 lsls r1, 24 @@ -368269,7 +368269,7 @@ _0812DED6: lsls r3, 24 lsrs r3, 24 adds r0, r4, 0 - bl AddObjectToFront + bl CreateSprite mov r8, r0 mov r1, r8 lsls r1, 24 @@ -368285,7 +368285,7 @@ _0812DED6: adds r0, r5, 0 movs r1, 0x1 str r2, [sp] - bl StartObjectImageAnim + bl StartSpriteAnim mov r0, r8 lsls r6, r0, 4 add r6, r8 @@ -368294,7 +368294,7 @@ _0812DED6: adds r4, r6, r1 adds r0, r4, 0 movs r1, 0x2 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r1, _0812DFD4 ldrh r0, [r1] strh r0, [r5, 0x30] @@ -368471,14 +368471,14 @@ sub_812E09C: @ 812E09C cmp r0, r2 bne _0812E0E8 adds r0, r3, r5 - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r0, 0x3C ldrsh r1, [r4, r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r5 - bl RemoveObjectAndFreeTiles + bl DestroySprite adds r0, r4, 0 bl move_anim_8072740 _0812E0E8: @@ -368487,7 +368487,7 @@ _0812E0E8: bx r0 .align 2, 0 _0812E0F0: .4byte 0x02020004 -_0812E0F4: .4byte nullsub_2 +_0812E0F4: .4byte SpriteCallbackDummy thumb_func_end sub_812E09C thumb_func_start sub_812E0F8 @@ -368534,7 +368534,7 @@ _0812E144: pop {r0} bx r0 .align 2, 0 -_0812E148: .4byte nullsub_2 +_0812E148: .4byte SpriteCallbackDummy thumb_func_end sub_812E0F8 thumb_func_start sub_812E14C @@ -369363,7 +369363,7 @@ _0812E7CE: strh r0, [r4, 0x32] ldrb r1, [r1, 0x2] adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r0, _0812E7EC str r0, [r4, 0x1C] pop {r4} @@ -370210,7 +370210,7 @@ _0812EE3E: bne _0812EE94 adds r0, r4, 0 movs r1, 0x1 - bl sub_8002068 + bl ChangeSpriteAffineAnim b _0812EE6E _0812EE54: adds r0, r4, 0 @@ -371522,7 +371522,7 @@ sub_812F88C: @ 812F88C ldr r0, _0812F8D4 ldrb r1, [r0] adds r0, r4, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim movs r0, 0x20 ldrsh r1, [r4, r0] movs r0, 0x22 @@ -371615,7 +371615,7 @@ sub_812F948: @ 812F948 strh r0, [r5, 0x2E] ldrb r1, [r6] adds r0, r5, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim ldr r0, _0812F9A4 ldrb r0, [r0] bl battle_side_get_owner @@ -372385,7 +372385,7 @@ _0812FF1C: lsls r3, 24 lsrs r3, 24 ldr r0, _0812FF8C - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -372465,7 +372465,7 @@ sub_812FF94: @ 812FF94 subs r0, 0x1 strh r0, [r1] adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _0812FFDA: pop {r4} pop {r0} @@ -372675,7 +372675,7 @@ _08130158: _08130172: adds r0, r5, 0 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim movs r0, 0xA0 lsls r0, 2 strh r0, [r5, 0x2E] @@ -372920,7 +372920,7 @@ _0813034A: ldrsh r2, [r3, r0] ldr r0, _08130388 movs r3, 0x23 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 @@ -373150,7 +373150,7 @@ sub_81304DC: @ 81304DC subs r0, 0x1 strh r0, [r1] adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _08130512: pop {r4} pop {r0} @@ -373261,7 +373261,7 @@ _081305C6: adds r0, r4, 0 adds r1, r5, 0 adds r2, r6, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 strh r0, [r7, 0x26] @@ -373321,7 +373321,7 @@ _081305C6: lsls r0, 2 adds r0, r4 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim _0813066E: ldr r0, _0813068C str r0, [r7] @@ -373461,14 +373461,14 @@ _08130730: ldrb r0, [r0, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r5 - bl RemoveObjectAndFreeTiles + bl DestroySprite _08130796: ldrh r0, [r4, 0x8] adds r0, 0x1 @@ -374886,7 +374886,7 @@ sub_81311E4: @ 81311E4 lsls r2, 16 asrs r2, 16 movs r3, 0x5 - bl AddObjectToFront + bl CreateSprite _08131242: movs r0, 0x38 ldrsh r1, [r4, r0] @@ -375081,7 +375081,7 @@ _08131384: lsls r0, 2 adds r0, r3 movs r1, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim _081313C6: mov r4, r9 adds r3, r7, 0 @@ -377093,7 +377093,7 @@ sub_8132370: @ 8132370 strh r0, [r4, 0x30] adds r0, r4, 0 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim b _081323CE .align 2, 0 _081323A8: .4byte 0x0202f7c9 @@ -377463,8 +377463,8 @@ _08132658: .4byte 0x02020004 thumb_func_start sub_813265C sub_813265C: @ 813265C push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -377528,8 +377528,8 @@ sub_81326D8: @ 81326D8 lsls r1, 19 movs r0, 0 strh r0, [r1] - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes bl ResetTasks ldr r4, _08132778 ldr r0, _0813277C @@ -377564,17 +377564,17 @@ sub_81326D8: @ 81326D8 strh r5, [r0] strh r5, [r0] ldr r0, _08132798 - bl LoadObjectPic + bl LoadSpriteSheet ldr r0, _0813279C - bl LoadTaggedObjectPalette + bl LoadSpritePalette bl sub_8133358 movs r0, 0 movs r1, 0 movs r2, 0x2 bl rboxid_80040B8 bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably ldr r0, _081327A0 bl SetMainCallback2 @@ -377598,8 +377598,8 @@ _081327A0: .4byte sub_8132870 thumb_func_start sub_81327A4 sub_81327A4: @ 81327A4 push {r4,r5,lr} - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes bl ResetTasks ldr r4, _08132844 ldr r0, _08132848 @@ -377640,17 +377640,17 @@ sub_81327A4: @ 81327A4 strh r5, [r0] strh r5, [r0] ldr r0, _08132864 - bl LoadObjectPic + bl LoadSpriteSheet ldr r0, _08132868 - bl LoadTaggedObjectPalette + bl LoadSpritePalette bl sub_8133358 movs r0, 0 movs r1, 0 movs r2, 0x2 bl rboxid_80040B8 bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably ldr r0, _0813286C bl SetMainCallback2 @@ -377717,8 +377717,8 @@ _081328A6: strb r1, [r0] _081328C8: bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r4} pop {r0} @@ -379019,7 +379019,7 @@ sub_8133358: @ 8133358 movs r1, 0x8 movs r2, 0x10 movs r3, 0 - bl AddObjectToFront + bl CreateSprite ldr r4, _08133540 ldr r1, [r4] strb r0, [r1, 0x3] @@ -379045,7 +379045,7 @@ sub_8133358: @ 8133358 movs r1, 0x48 movs r2, 0x10 movs r3, 0 - bl AddObjectToFront + bl CreateSprite ldr r1, [r4] strb r0, [r1, 0x4] ldr r0, [r4] @@ -379055,7 +379055,7 @@ sub_8133358: @ 8133358 lsls r0, 2 adds r0, r5 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r2, [r4] ldrb r1, [r2, 0x4] lsls r0, r1, 4 @@ -379076,7 +379076,7 @@ sub_8133358: @ 8133358 movs r1, 0xA0 movs r2, 0x4 movs r3, 0 - bl AddObjectToFront + bl CreateSprite ldr r1, [r4] strb r0, [r1, 0x5] ldr r0, [r4] @@ -379086,7 +379086,7 @@ sub_8133358: @ 8133358 lsls r0, 2 adds r0, r5 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r2, [r4] ldrb r1, [r2, 0x5] lsls r0, r1, 4 @@ -379107,7 +379107,7 @@ sub_8133358: @ 8133358 movs r1, 0xA0 movs r2, 0x3C movs r3, 0 - bl AddObjectToFront + bl CreateSprite ldr r1, [r4] strb r0, [r1, 0x6] ldr r2, [r4] @@ -379147,7 +379147,7 @@ _08133456: asrs r2, 16 adds r0, r6, 0 movs r3, 0 - bl AddObjectToFront + bl CreateSprite ldr r1, [r4] adds r2, r5, 0x4 adds r1, 0x3 @@ -379163,7 +379163,7 @@ _08133456: ldr r1, _08133544 adds r0, r1 movs r1, 0x2 - bl StartObjectImageAnim + bl StartSpriteAnim adds r5, 0x1 cmp r5, 0x7 ble _0813344E @@ -379191,7 +379191,7 @@ _081334AE: asrs r2, 16 adds r0, r7, 0 movs r3, 0 - bl AddObjectToFront + bl CreateSprite ldr r1, [r6] adds r2, r5, 0 adds r2, 0xC @@ -379208,7 +379208,7 @@ _081334AE: ldr r4, _08133544 adds r0, r4 movs r1, 0x2 - bl StartObjectImageAnim + bl StartSpriteAnim adds r5, 0x1 cmp r5, 0x7 ble _081334A6 @@ -379858,7 +379858,7 @@ _08133A1A: lsls r0, 2 adds r0, r6 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim b _08133A58 .align 2, 0 _08133A34: .4byte gUnknown_083D00AC @@ -379874,7 +379874,7 @@ _08133A44: lsls r0, 2 adds r0, r6 movs r1, 0 - bl StartObjectImageAnim + bl StartSpriteAnim _08133A58: adds r0, r4, 0x1 lsls r0, 24 @@ -379920,7 +379920,7 @@ _08133A9A: lsls r0, 2 adds r0, r6 movs r1, 0x3 - bl StartObjectImageAnim + bl StartSpriteAnim b _08133AD8 .align 2, 0 _08133AB4: .4byte gUnknown_083D00AC @@ -379936,7 +379936,7 @@ _08133AC4: lsls r0, 2 adds r0, r6 movs r1, 0x2 - bl StartObjectImageAnim + bl StartSpriteAnim _08133AD8: adds r0, r4, 0x1 lsls r0, 24 @@ -380474,7 +380474,7 @@ sub_8133EF8: @ 8133EF8 lsls r0, 2 ldr r1, _08133F48 adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r0, 0x3 movs r1, 0xE movs r2, 0x1A @@ -385011,8 +385011,8 @@ sub_81361E4: @ 81361E4 ldr r0, [r4] ldr r0, [r0] bl _call_via_r0 - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably ldr r4, [r4] ldr r1, [r4] @@ -385042,8 +385042,8 @@ _08136228: .4byte sub_813622C sub_813622C: @ 813622C push {lr} bl sub_81368A4 - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r0} bx r0 @@ -385056,8 +385056,8 @@ sub_8136244: @ 8136244 ldr r0, [r0] ldr r0, [r0] bl _call_via_r0 - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r0} bx r0 @@ -385068,8 +385068,8 @@ _08136260: .4byte 0x02039304 thumb_func_start sub_8136264 sub_8136264: @ 8136264 push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram movs r0, 0x6 bl sub_80F5CDC @@ -385164,8 +385164,8 @@ _08136348: .4byte 0x00006dac _0813634C: .4byte 0x02039304 _08136350: .4byte sub_81365A0 _08136354: - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes b _08136524 _0813635E: movs r0, 0 @@ -386912,9 +386912,9 @@ sub_8137138: @ 8137138 mov r7, r8 push {r7} ldr r0, _081371C0 - bl LoadObjectPic + bl LoadSpriteSheet ldr r0, _081371C4 - bl LoadTaggedObjectPalette + bl LoadSpritePalette ldr r2, _081371C8 ldr r0, [r2] adds r0, 0x54 @@ -386942,7 +386942,7 @@ _08137160: ldrsh r2, [r2, r0] ldr r0, _081371D4 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -387013,7 +387013,7 @@ _081371F8: cmp r0, 0x3C ble _08137218 adds r0, r1, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r0, _0813721C ldr r1, [r0] adds r1, 0x54 @@ -387295,7 +387295,7 @@ _08137440: _08137444: .4byte 0x02020004 _08137448: .4byte 0x02024be0 _0813744C: .4byte 0x02024a60 -_08137450: .4byte nullsub_2 +_08137450: .4byte SpriteCallbackDummy thumb_func_end sub_813741C thumb_func_start sub_8137454 @@ -387508,7 +387508,7 @@ _08137596: lsls r0, 2 ldr r1, _081376A4 adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r4, _081376A8 ldrb r0, [r5] adds r1, r6, 0 @@ -387544,7 +387544,7 @@ _08137626: lsls r0, 2 ldr r1, _081376A4 adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r5, _081376A8 ldrb r1, [r4] adds r0, r1, r5 @@ -387678,9 +387678,9 @@ _081376DC: strb r4, [r0, 0x1] ldr r4, _081377A0 adds r0, r4, 0 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag adds r0, r4, 0 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag ldr r0, _081377A4 movs r1, 0xA bl CreateTask @@ -387703,7 +387703,7 @@ _08137784: _0813778C: .4byte 0x02020004 _08137790: .4byte 0x03004340 _08137794: .4byte 0x02024a60 -_08137798: .4byte nullsub_2 +_08137798: .4byte SpriteCallbackDummy _0813779C: .4byte 0x02017810 _081377A0: .4byte 0x000027f9 _081377A4: .4byte c3_0802FDF4 @@ -387852,7 +387852,7 @@ sub_813789C: @ 813789C lsls r0, 2 ldr r4, _08137900 adds r0, r4 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] @@ -387860,7 +387860,7 @@ sub_813789C: @ 813789C adds r0, r1 lsls r0, 2 adds r0, r4 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r1, _08137904 ldrb r0, [r6] adds r0, r1 @@ -387905,7 +387905,7 @@ _0813792C: _08137930: .4byte 0x02020004 _08137934: .4byte 0x02024be0 _08137938: .4byte 0x02024a60 -_0813793C: .4byte nullsub_2 +_0813793C: .4byte SpriteCallbackDummy thumb_func_end sub_8137908 thumb_func_start sub_8137940 @@ -390257,7 +390257,7 @@ _08138CF0: lsls r0, 2 ldr r4, _08138D30 adds r0, r4 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] @@ -390265,7 +390265,7 @@ _08138CF0: adds r0, r1 lsls r0, 2 adds r0, r4 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r1, _08138D34 ldrb r0, [r6] adds r0, r1 @@ -390308,7 +390308,7 @@ sub_8138D38: @ 8138D38 asrs r2, 16 movs r1, 0x50 movs r3, 0x1E - bl AddObjectToFront + bl CreateSprite ldr r6, _08138DEC ldrb r1, [r4] adds r1, r6 @@ -390402,7 +390402,7 @@ sub_8138E04: @ 8138E04 asrs r2, 16 movs r1, 0x50 movs r3, 0x1E - bl AddObjectToFront + bl CreateSprite ldr r6, _08138EB8 ldrb r1, [r4] adds r1, r6 @@ -391631,9 +391631,9 @@ sub_8139750: @ 8139750 lsls r0, 2 adds r0, r5 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r0, _08139898 - bl AllocObjectPalette + bl AllocSpritePalette adds r4, r0, 0 lsls r4, 24 ldr r0, _0813989C @@ -391791,7 +391791,7 @@ sub_81398BC: @ 81398BC mov r0, r10 adds r1, r5, 0 adds r2, r4, 0 - bl AddObjectToFront + bl CreateSprite ldr r4, _08139A1C adds r4, r6, r4 strb r0, [r4] @@ -391836,7 +391836,7 @@ sub_81398BC: @ 81398BC ldr r1, _08139A24 adds r6, r1 ldrb r1, [r6] - bl StartObjectImageAnim + bl StartSpriteAnim ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -391886,7 +391886,7 @@ _08139A18: .4byte 0x02024e8c _08139A1C: .4byte 0x02024be0 _08139A20: .4byte 0x02020004 _08139A24: .4byte 0x02024e84 -_08139A28: .4byte nullsub_2 +_08139A28: .4byte SpriteCallbackDummy thumb_func_end sub_81398BC thumb_func_start sub_8139A2C @@ -395604,8 +395604,8 @@ _0813B780: .4byte sub_813B174 thumb_func_start sub_813B784 sub_813B784: @ 813B784 push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -395615,8 +395615,8 @@ sub_813B784: @ 813B784 sub_813B798: @ 813B798 push {lr} bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably ldr r0, _0813B7C8 ldrh r0, [r0, 0x2E] @@ -395797,8 +395797,8 @@ _0813B890: bl sub_813B808 bl remove_some_task bl ResetTasks - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes movs r0, 0x1 negs r0, r0 ldr r1, _0813B99C @@ -396070,7 +396070,7 @@ task_intro_1: @ 813BA94 ldr r0, _0813BC78 bl LoadCompressedObjectPic ldr r0, _0813BC7C - bl LoadTaggedObjectPalettes + bl LoadSpritePalettes ldr r4, _0813BC80 movs r0, 0xF0 lsls r0, 1 @@ -396407,7 +396407,7 @@ task_intro_4: @ 813BDEC movs r1, 0xC8 movs r2, 0xA0 movs r3, 0xA - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r2, _0813BEA8 @@ -396500,8 +396500,8 @@ task_intro_6: @ 813BF20 bl intro_reset_and_hide_bgs movs r0, 0 bl SetVBlankCallback - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes ldr r0, _0813BF60 movs r1, 0 strh r1, [r0] @@ -396551,7 +396551,7 @@ _0813BF96: ldr r0, _0813BFC4 bl LoadCompressedObjectPic ldr r0, _0813BFC8 - bl LoadTaggedObjectPalettes + bl LoadSpritePalettes ldr r0, _0813BFCC ldrh r0, [r0] cmp r0, 0 @@ -396893,8 +396893,8 @@ task_intro_10: @ 813C230 movs r2, 0 movs r3, 0 bl sub_813CE30 - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes movs r0, 0x1 negs r0, r0 ldr r1, _0813C2D4 @@ -397161,8 +397161,8 @@ _0813C45A: movs r1, 0 movs r2, 0x20 bl gpu_pal_apply - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes ldr r1, _0813C530 movs r0, 0x8 strb r0, [r1] @@ -397173,7 +397173,7 @@ _0813C45A: ldr r0, _0813C53C bl LoadCompressedObjectPalette ldr r0, _0813C540 - bl LoadTaggedObjectPalettes + bl LoadSpritePalettes ldr r1, _0813C544 mov r2, r8 adds r0, r7, r2 @@ -397830,7 +397830,7 @@ _0813C9B2: movs r1, 0x78 movs r2, 0x50 movs r3, 0xF - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r2, r0, 24 lsls r0, r2, 4 @@ -398496,7 +398496,7 @@ _0813CF1C: adds r3, 0x1 lsls r3, 26 lsrs r3, 24 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r1, _0813CFA4 @@ -398598,7 +398598,7 @@ sub_813CFA8: @ 813CFA8 asrs r2, 16 mov r10, r2 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r1, _0813D080 @@ -398706,7 +398706,7 @@ _0813D0EA: str r1, [sp] movs r2, 0 movs r3, 0 - bl SetSpriteTransformationMatrix + bl SetOamMatrix movs r0, 0x32 ldrsh r1, [r4, r0] lsls r0, r1, 1 @@ -398741,7 +398741,7 @@ _0813D13A: b _0813D14E _0813D148: adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _0813D14E: add sp, 0x4 pop {r4} @@ -398780,7 +398780,7 @@ sub_813D158: @ 813D158 strh r0, [r4, 0x22] adds r0, r4, 0 movs r1, 0x3 - bl StartObjectImageAnim + bl StartSpriteAnim movs r0, 0x80 lsls r0, 3 strh r0, [r4, 0x32] @@ -398805,7 +398805,7 @@ sub_813D158: @ 813D158 movs r1, 0x1 movs r2, 0x3 movs r3, 0x2 - bl CalcVecFromObjectCenterToObjectUpperLeft + bl CalcCenterToCornerVec b _0813D200 .align 2, 0 _0813D1CC: .4byte 0x02020004 @@ -398987,7 +398987,7 @@ _0813D304: adds r1, r4, 0 movs r2, 0 movs r3, 0 - bl SetSpriteTransformationMatrix + bl SetOamMatrix ldrh r0, [r7, 0x30] adds r0, 0x1 lsls r0, 24 @@ -399000,7 +399000,7 @@ _0813D304: str r6, [sp] mov r1, r8 mov r2, r9 - bl SetSpriteTransformationMatrix + bl SetOamMatrix ldrh r0, [r7, 0x30] adds r0, 0x2 lsls r0, 24 @@ -399013,7 +399013,7 @@ _0813D304: mov r1, r8 mov r2, r9 adds r3, r5, 0 - bl SetSpriteTransformationMatrix + bl SetOamMatrix _0813D352: add sp, 0x4 pop {r3-r5} @@ -399042,7 +399042,7 @@ sub_813D368: @ 813D368 str r1, [sp] movs r2, 0 movs r3, 0 - bl SetSpriteTransformationMatrix + bl SetOamMatrix ldrh r0, [r4, 0x30] adds r0, 0x1 lsls r0, 24 @@ -399054,7 +399054,7 @@ sub_813D368: @ 813D368 str r1, [sp] movs r2, 0 movs r3, 0 - bl SetSpriteTransformationMatrix + bl SetOamMatrix ldrh r0, [r4, 0x30] adds r0, 0x2 lsls r0, 24 @@ -399066,7 +399066,7 @@ sub_813D368: @ 813D368 str r1, [sp] movs r2, 0 movs r3, 0 - bl SetSpriteTransformationMatrix + bl SetOamMatrix ldrh r1, [r4, 0x36] movs r2, 0x36 ldrsh r0, [r4, r2] @@ -399214,7 +399214,7 @@ _0813D49C: strh r0, [r4, 0x22] adds r0, r4, 0 movs r1, 0x3 - bl StartObjectImageAnim + bl StartSpriteAnim movs r0, 0x80 lsls r0, 3 strh r0, [r4, 0x32] @@ -399239,7 +399239,7 @@ _0813D49C: movs r1, 0x1 movs r2, 0x3 movs r3, 0x2 - bl CalcVecFromObjectCenterToObjectUpperLeft + bl CalcCenterToCornerVec _0813D4F8: pop {r4} pop {r0} @@ -399281,7 +399281,7 @@ _0813D51C: strh r0, [r4, 0x22] adds r0, r4, 0 movs r1, 0x3 - bl StartObjectImageAnim + bl StartSpriteAnim movs r0, 0x80 lsls r0, 3 strh r0, [r4, 0x32] @@ -399306,7 +399306,7 @@ _0813D51C: movs r1, 0x1 movs r2, 0x3 movs r3, 0x2 - bl CalcVecFromObjectCenterToObjectUpperLeft + bl CalcCenterToCornerVec _0813D578: pop {r4} pop {r0} @@ -399352,7 +399352,7 @@ sub_813D584: @ 813D584 adds r1, r4, 0 adds r2, r5, 0 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r7, r0, 24 ldr r2, _0813D644 @@ -399395,10 +399395,10 @@ sub_813D584: @ 813D584 movs r1, 0 movs r2, 0x2 movs r3, 0x2 - bl CalcVecFromObjectCenterToObjectUpperLeft + bl CalcCenterToCornerVec adds r0, r4, 0 movs r1, 0x2 - bl StartObjectImageAnim + bl StartSpriteAnim mov r1, r8 cmp r1, 0 bne _0813D64C @@ -399431,7 +399431,7 @@ _0813D654: mov r1, r10 mov r2, r8 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r7, r0, 24 ldr r5, _0813D77C @@ -399464,7 +399464,7 @@ _0813D654: movs r1, 0 movs r2, 0x2 movs r3, 0x2 - bl CalcVecFromObjectCenterToObjectUpperLeft + bl CalcCenterToCornerVec ldr r2, _0813D780 adds r4, r2 ldr r0, _0813D784 @@ -399473,7 +399473,7 @@ _0813D654: mov r1, r10 mov r2, r8 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r7, r0, 24 lsls r4, r7, 4 @@ -399489,7 +399489,7 @@ _0813D654: strh r2, [r5, 0x30] adds r0, r5, 0 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim ldrb r0, [r5, 0x1] movs r1, 0x3 orrs r0, r1 @@ -399506,7 +399506,7 @@ _0813D654: movs r1, 0 movs r2, 0x2 movs r3, 0x2 - bl CalcVecFromObjectCenterToObjectUpperLeft + bl CalcCenterToCornerVec ldr r0, _0813D780 adds r4, r0 ldr r1, _0813D784 @@ -399522,7 +399522,7 @@ _0813D654: adds r1, r4, 0 movs r2, 0 movs r3, 0 - bl SetSpriteTransformationMatrix + bl SetOamMatrix mov r0, r9 lsls r0, 24 lsrs r0, 24 @@ -399531,7 +399531,7 @@ _0813D654: adds r1, r4, 0 movs r2, 0 movs r3, 0 - bl SetSpriteTransformationMatrix + bl SetOamMatrix mov r1, r8 lsls r1, 24 lsrs r1, 24 @@ -399543,7 +399543,7 @@ _0813D654: adds r1, r4, 0 movs r2, 0 movs r3, 0 - bl SetSpriteTransformationMatrix + bl SetOamMatrix ldr r0, [sp, 0x10] add sp, 0x14 pop {r3-r5} @@ -399586,14 +399586,14 @@ _0813D7A4: _0813D7B8: adds r0, r4, 0 movs r1, 0 - bl StartObjectImageAnimIfDifferent + bl StartSpriteAnimIfDifferent ldrh r0, [r4, 0x20] subs r0, 0x1 b _0813D82E _0813D7C6: adds r0, r4, 0 movs r1, 0 - bl StartObjectImageAnimIfDifferent + bl StartSpriteAnimIfDifferent ldr r0, _0813D7E0 ldr r0, [r0] movs r1, 0x7 @@ -399608,7 +399608,7 @@ _0813D7E0: .4byte 0x03005ed0 _0813D7E4: adds r0, r4, 0 movs r1, 0x2 - bl StartObjectImageAnimIfDifferent + bl StartSpriteAnimIfDifferent ldrh r2, [r4, 0x20] movs r1, 0x20 ldrsh r0, [r4, r1] @@ -399628,12 +399628,12 @@ _0813D808: .4byte 0x03005ed0 _0813D80C: adds r0, r4, 0 movs r1, 0x3 - bl StartObjectImageAnimIfDifferent + bl StartSpriteAnimIfDifferent b _0813D830 _0813D816: adds r0, r4, 0 movs r1, 0 - bl StartObjectImageAnimIfDifferent + bl StartSpriteAnimIfDifferent ldrh r2, [r4, 0x20] movs r0, 0x20 ldrsh r1, [r4, r0] @@ -399805,7 +399805,7 @@ _0813D934: b _0813D94E _0813D948: adds r0, r3, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _0813D94E: pop {r0} bx r0 @@ -399850,7 +399850,7 @@ _0813D97C: ldr r0, _0813DA50 asrs r2, 16 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r2, r0, 24 ldr r1, _0813DA54 @@ -399862,7 +399862,7 @@ _0813D97C: strh r1, [r0, 0x2E] adds r4, r7 ldrb r1, [r4] - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 @@ -399888,7 +399888,7 @@ _0813D9D0: mov r3, r10 asrs r2, r3, 16 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r2, r0, 24 ldr r6, _0813DA54 @@ -399900,7 +399900,7 @@ _0813D9D0: strh r1, [r0, 0x2E] adds r4, r7 ldrb r1, [r4] - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 @@ -399913,7 +399913,7 @@ _0813D9D0: asrs r2, 16 movs r1, 0x78 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r2, r0, 24 lsls r0, r2, 4 @@ -399971,7 +399971,7 @@ _0813DA7C: movs r1, 0x1 movs r2, 0x3 movs r3, 0x3 - bl CalcVecFromObjectCenterToObjectUpperLeft + bl CalcCenterToCornerVec adds r2, r4, 0 adds r2, 0x3E ldrb r1, [r2] @@ -400062,7 +400062,7 @@ _0813DB40: adds r3, r5, 0 str r1, [sp] movs r0, 0x1 - bl SetSpriteTransformationMatrix + bl SetOamMatrix ldrh r1, [r4, 0x30] movs r2, 0x30 ldrsh r0, [r4, r2] @@ -400217,7 +400217,7 @@ _0813DC3E: movs r1, 0 movs r2, 0x3 movs r3, 0x3 - bl CalcVecFromObjectCenterToObjectUpperLeft + bl CalcCenterToCornerVec movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0 @@ -400232,7 +400232,7 @@ _0813DC3E: str r2, [sp] movs r2, 0 movs r3, 0 - bl SetSpriteTransformationMatrix + bl SetOamMatrix b _0813DC9E _0813DC8A: ldrh r0, [r4, 0x30] @@ -400243,7 +400243,7 @@ _0813DC8A: str r1, [sp] movs r2, 0 movs r3, 0 - bl SetSpriteTransformationMatrix + bl SetOamMatrix _0813DC9E: ldrh r0, [r4, 0x2E] adds r0, 0x1 @@ -400334,11 +400334,11 @@ _0813DD34: _0813DD3E: movs r2, 0 movs r3, 0 - bl SetSpriteTransformationMatrix + bl SetOamMatrix b _0813DD4E _0813DD48: adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _0813DD4E: add sp, 0x4 pop {r4} @@ -400424,7 +400424,7 @@ _0813DDDA: _0813DDE4: movs r2, 0 movs r3, 0 - bl SetSpriteTransformationMatrix + bl SetOamMatrix b _0813DE66 _0813DDEE: movs r1, 0x32 @@ -400439,7 +400439,7 @@ _0813DDEE: str r2, [sp] movs r2, 0 movs r3, 0 - bl SetSpriteTransformationMatrix + bl SetOamMatrix b _0813DE1E _0813DE0C: ldrh r0, [r4, 0x30] @@ -400449,7 +400449,7 @@ _0813DE0C: adds r1, r2, 0 movs r2, 0 movs r3, 0 - bl SetSpriteTransformationMatrix + bl SetOamMatrix _0813DE1E: ldrh r0, [r4, 0x2E] adds r0, 0x1 @@ -400541,13 +400541,13 @@ _0813DEB0: _0813DEC0: adds r0, r7, 0 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r4, _0813DEF0 adds r0, r4, 0 movs r1, 0x10 movs r2, 0x68 movs r3, 0x64 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 strh r0, [r7, 0x3A] @@ -400555,7 +400555,7 @@ _0813DEC0: movs r1, 0xC movs r2, 0x6A movs r3, 0x65 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 strh r0, [r7, 0x3C] @@ -400565,7 +400565,7 @@ _0813DEF0: .4byte gUnknown_0840B084 _0813DEF4: adds r0, r7, 0 movs r1, 0x2 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r2, _0813DF28 movs r3, 0x3A ldrsh r1, [r7, r3] @@ -400630,7 +400630,7 @@ _0813DF54: adds r4, r2 lsls r4, 16 lsrs r4, 16 - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r0, 0x8C lsls r0, 1 lsls r5, 16 @@ -400703,7 +400703,7 @@ _0813DF54: adds r4, r2 lsls r4, 16 lsrs r4, 16 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r0, _0813E0A0 lsls r5, 16 asrs r1, r5, 16 @@ -400800,16 +400800,16 @@ _0813E0D0: lsls r0, 2 ldr r4, _0813E108 adds r0, r4 - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r3, 0x3C ldrsh r1, [r7, r3] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r4 - bl RemoveObjectAndFreeTiles + bl DestroySprite adds r0, r7, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _0813E0F8: add sp, 0x4 pop {r3-r5} @@ -401214,7 +401214,7 @@ _0813E3EE: str r1, [sp] movs r0, 0x1 adds r2, r4, 0 - bl SetSpriteTransformationMatrix + bl SetOamMatrix b _0813E4AC .align 2, 0 _0813E418: .4byte gUnknown_08208344 @@ -401291,7 +401291,7 @@ _0813E486: str r1, [sp] movs r0, 0x2 adds r2, r4, 0 - bl SetSpriteTransformationMatrix + bl SetOamMatrix _0813E4AC: add sp, 0x4 pop {r4} @@ -401334,7 +401334,7 @@ _0813E4E4: cmp r0, 0x3F ble _0813E4F8 adds r0, r5, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite b _0813E574 _0813E4F8: adds r0, r1, 0x2 @@ -401395,7 +401395,7 @@ _0813E550: lsrs r3, 16 str r1, [sp] movs r0, 0x10 - bl SetSpriteTransformationMatrix + bl SetOamMatrix _0813E574: add sp, 0x4 pop {r4,r5} @@ -401417,7 +401417,7 @@ _0813E58A: asrs r1, r6, 16 asrs r2, r5, 16 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r2, r0, 4 @@ -401464,7 +401464,7 @@ sub_813E5E0: @ 813E5E0 cmp r0, 0 beq _0813E5F8 adds r0, r3, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite b _0813E6B2 .align 2, 0 _0813E5F4: .4byte 0x0203931a @@ -401564,7 +401564,7 @@ _0813E696: cmp r0, r1 ble _0813E6B2 adds r0, r3, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _0813E6B2: pop {r4} pop {r0} @@ -401588,7 +401588,7 @@ sub_813E6C0: @ 813E6C0 cmp r0, 0 beq _0813E6E4 adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite b _0813E7A8 .align 2, 0 _0813E6E0: .4byte 0x0203931a @@ -401653,7 +401653,7 @@ _0813E73A: asrs r1, r2, 16 mov r7, r9 asrs r2, r7, 16 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -401715,7 +401715,7 @@ sub_813E7C0: @ 813E7C0 movs r1, 0 movs r2, 0 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 @@ -401751,7 +401751,7 @@ sub_813E804: @ 813E804 cmp r0, 0 beq _0813E81C adds r0, r3, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite b _0813E928 .align 2, 0 _0813E818: .4byte 0x0203931a @@ -401917,7 +401917,7 @@ _0813E942: ldrsh r2, [r5, r0] ldr r0, _0813E97C movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -401952,7 +401952,7 @@ GetCurrentTrainerHillMapId: @ 813E980 cmp r0, 0 beq _0813E998 adds r0, r3, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite b _0813EA50 .align 2, 0 _0813E994: .4byte 0x0203931a @@ -402051,7 +402051,7 @@ _0813EA2C: cmp r0, 0xA0 ble _0813EA50 adds r0, r3, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _0813EA50: pop {r4,r5} pop {r0} @@ -402073,7 +402073,7 @@ sub_813EA60: @ 813EA60 cmp r0, 0 beq _0813EA80 adds r0, r5, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite b _0813EB32 .align 2, 0 _0813EA7C: .4byte 0x0203931a @@ -402125,7 +402125,7 @@ _0813EA80: adds r3, 0x1 lsls r3, 24 lsrs r3, 24 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -402149,7 +402149,7 @@ _0813EA80: movs r1, 0 movs r2, 0x1 movs r3, 0x3 - bl CalcVecFromObjectCenterToObjectUpperLeft + bl CalcCenterToCornerVec ldrh r0, [r5, 0x2E] strh r0, [r4, 0x2E] ldr r2, _0813EB48 @@ -402188,7 +402188,7 @@ sub_813EB4C: @ 813EB4C movs r1, 0 movs r2, 0 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 @@ -402219,7 +402219,7 @@ _0813EB84: str r1, [sp] movs r2, 0 movs r3, 0 - bl SetSpriteTransformationMatrix + bl SetOamMatrix adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -402244,7 +402244,7 @@ sub_813EBBC: @ 813EBBC cmp r0, 0 beq _0813EBD4 adds r0, r3, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite b _0813EC80 .align 2, 0 _0813EBD0: .4byte 0x0203931a @@ -402336,7 +402336,7 @@ _0813EC64: cmp r0, r1 bge _0813EC80 adds r0, r3, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _0813EC80: pop {r4} pop {r0} @@ -402359,7 +402359,7 @@ sub_813EC90: @ 813EC90 cmp r0, 0 beq _0813ECB0 adds r0, r5, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite b _0813EDA0 .align 2, 0 _0813ECAC: .4byte 0x0203931a @@ -402411,7 +402411,7 @@ _0813ECB0: adds r3, 0x1 lsls r3, 24 lsrs r3, 24 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -402435,7 +402435,7 @@ _0813ECB0: movs r1, 0 movs r2, 0x1 movs r3, 0x3 - bl CalcVecFromObjectCenterToObjectUpperLeft + bl CalcCenterToCornerVec ldrh r0, [r5, 0x2E] strh r0, [r4, 0x2E] ldrh r0, [r5, 0x3C] @@ -402482,7 +402482,7 @@ _0813ED74: movs r0, 0x11 movs r2, 0 movs r3, 0 - bl SetSpriteTransformationMatrix + bl SetOamMatrix _0813EDA0: add sp, 0x4 pop {r3,r4} @@ -402506,7 +402506,7 @@ sub_813EDBC: @ 813EDBC movs r1, 0 movs r2, 0 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 @@ -402568,7 +402568,7 @@ _0813EE12: movs r1, 0 movs r2, 0x3 movs r3, 0x3 - bl CalcVecFromObjectCenterToObjectUpperLeft + bl CalcCenterToCornerVec movs r0, 0 strh r0, [r5, 0x30] movs r0, 0x1 @@ -402620,7 +402620,7 @@ _0813EE7A: movs r0, 0x12 movs r2, 0 movs r3, 0 - bl SetSpriteTransformationMatrix + bl SetOamMatrix add sp, 0x4 pop {r4,r5} pop {r0} @@ -402676,8 +402676,8 @@ sub_813EEE4: @ 813EEE4 strh r1, [r0] adds r0, 0x2 strh r1, [r0] - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes ldr r0, _0813EF98 movs r1, 0 bl sub_80FA8EC @@ -402741,8 +402741,8 @@ _0813EFAC: .4byte sub_813EFB0 thumb_func_start sub_813EFB0 sub_813EFB0: @ 813EFB0 push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -402752,8 +402752,8 @@ sub_813EFB0: @ 813EFB0 sub_813EFC4: @ 813EFC4 push {lr} bl sub_813EFDC - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r0} bx r0 @@ -403119,7 +403119,7 @@ _0813F2C8: .4byte 0x00003f42 _0813F2CC: .4byte 0x0400000a _0813F2D0: .4byte 0x03004340 _0813F2D4: .4byte 0x02020004 -_0813F2D8: .4byte nullsub_2 +_0813F2D8: .4byte SpriteCallbackDummy _0813F2DC: .4byte 0x040000d4 _0813F2E0: .4byte 0x85000400 _0813F2E4: .4byte gUnknown_08D2EE48 @@ -403286,14 +403286,14 @@ _0813F406: ldr r1, _0813F4DC mov r8, r1 add r0, r8 - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r2, 0xC ldrsh r1, [r4, r2] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 add r0, r8 - bl RemoveObjectAndFreeTiles + bl DestroySprite mov r0, sp bl sub_8078914 ldr r2, [sp, 0x4] @@ -403398,14 +403398,14 @@ sub_813F4EC: @ 813F4EC lsls r4, 24 lsrs r4, 24 ldr r0, _0813F5DC - bl AllocObjectPalette + bl AllocSpritePalette mov r8, r0 mov r1, r8 lsls r1, 24 lsrs r1, 24 mov r8, r1 ldr r0, _0813F5E0 - bl AllocObjectPalette + bl AllocSpritePalette mov r9, r0 mov r2, r9 lsls r2, 24 @@ -403518,16 +403518,16 @@ sub_813F5E8: @ 813F5E8 lsls r6, 24 lsrs r6, 24 ldr r0, _0813F690 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag ldr r0, _0813F694 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag ldr r0, _0813F698 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 ldr r0, _0813F69C - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsls r4, 4 ldrb r2, [r5, 0x5] @@ -403620,7 +403620,7 @@ sub_813F6CC: @ 813F6CC blt _0813F78C strh r6, [r4, 0x8] ldr r0, _0813F71C - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r2, r0, 24 movs r3, 0x1C @@ -404111,7 +404111,7 @@ sub_813FA94: @ 813FA94 movs r1, 0x20 movs r2, 0x50 movs r3, 0x1D - bl AddObjectToFront + bl CreateSprite adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 @@ -404273,7 +404273,7 @@ _0813FBE0: movs r2, 0x50 orrs r5, r2 adds r2, r5, 0 - bl AddObjectToFront + bl CreateSprite adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 @@ -404318,7 +404318,7 @@ _0813FBE0: lsls r0, 2 add r0, r9 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r1, _0813FCB4 lsls r0, r7, 2 adds r0, r7 @@ -404338,7 +404338,7 @@ _0813FC9C: .4byte 0x02024c04 _0813FCA0: .4byte gUnknown_0820AAB4 _0813FCA4: .4byte 0x02020004 _0813FCA8: .4byte 0x0202f7c9 -_0813FCAC: .4byte nullsub_2 +_0813FCAC: .4byte SpriteCallbackDummy _0813FCB0: .4byte 0x02024be0 _0813FCB4: .4byte 0x03004b20 _0813FCB8: .4byte sub_813FCBC @@ -404434,7 +404434,7 @@ sub_813FD34: @ 813FD34 lsls r0, 2 adds r0, r6 movs r1, 0 - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r5, 0 bl DestroyTask _0813FD80: @@ -404494,7 +404494,7 @@ _0813FDE4: .4byte sub_81407B8 _0813FDE8: adds r0, r4, 0 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim ldrh r0, [r4, 0x24] ldrh r1, [r4, 0x20] adds r0, r1 @@ -404748,7 +404748,7 @@ _0813FFDC: bl DestroyTask adds r0, r7, 0 movs r1, 0x2 - bl StartObjectImageAnim + bl StartSpriteAnim movs r0, 0 strh r0, [r7, 0x38] ldr r0, _08140010 @@ -404953,7 +404953,7 @@ sub_8140158: @ 8140158 strb r0, [r2] adds r0, r4, 0 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim ldr r0, _08140198 strh r5, [r0, 0xC] ldr r0, _0814019C @@ -405065,12 +405065,12 @@ _08140226: bge _08140262 adds r0, r4, 0 movs r1, 0x2 - bl sub_8002068 + bl ChangeSpriteAffineAnim b _0814040A _08140262: adds r0, r4, 0 movs r1, 0x1 - bl sub_8002068 + bl ChangeSpriteAffineAnim b _0814040A _0814026C: ldr r0, _08140288 @@ -405154,12 +405154,12 @@ _081402DA: bge _08140308 adds r0, r4, 0 movs r1, 0x2 - bl sub_8002068 + bl ChangeSpriteAffineAnim b _08140310 _08140308: adds r0, r4, 0 movs r1, 0x1 - bl sub_8002068 + bl ChangeSpriteAffineAnim _08140310: ldr r0, _0814032C ldrh r2, [r0, 0xC] @@ -405270,21 +405270,21 @@ _081403C4: strh r0, [r4, 0x34] adds r0, r4, 0 movs r1, 0x3 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim movs r3, 0x36 ldrsh r0, [r4, r3] cmp r0, 0 bge _081403FC adds r0, r4, 0 movs r1, 0x2 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim b _08140404 .align 2, 0 _081403F8: .4byte 0xffffff00 _081403FC: adds r0, r4, 0 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim _08140404: movs r0, 0x17 bl audio_play @@ -405378,7 +405378,7 @@ _08140490: ldrb r0, [r0, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix ldrb r0, [r7] adds r0, r4 ldrb r1, [r0] @@ -405386,7 +405386,7 @@ _08140490: adds r0, r1 lsls r0, 2 adds r0, r5 - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r0, 0 strh r0, [r6, 0x2E] ldr r0, _081404E0 @@ -405440,7 +405440,7 @@ _08140502: strh r0, [r1] ldr r0, [r4, 0x14] ldrh r0, [r0, 0x2] - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r0, 24 adds r0, 0x10 @@ -405537,9 +405537,9 @@ sub_81405C8: @ 81405C8 _081405DC: .4byte 0x0000ffff _081405E0: adds r0, r4, 0 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _081405EC: pop {r4} pop {r0} @@ -405552,10 +405552,10 @@ sub_81405F4: @ 81405F4 sub sp, 0x4 adds r4, r0, 0 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r4, 0 movs r1, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim ldr r0, _081406A8 str r0, [r4, 0x1C] ldr r0, _081406AC @@ -405609,7 +405609,7 @@ _08140646: lsls r0, 2 adds r0, r6 movs r1, 0x1 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -405617,7 +405617,7 @@ _08140646: adds r0, r1 lsls r0, 2 adds r0, r6 - bl AnimateObject + bl AnimateSprite ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -405676,7 +405676,7 @@ _081406DA: bge _08140714 adds r0, r1, 0 movs r1, 0 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim movs r5, 0x1 b _08140734 .align 2, 0 @@ -405887,7 +405887,7 @@ sub_814086C: @ 814086C lsls r6, r5, 3 adds r4, r6, r0 ldrh r0, [r4, 0x6] - bl GetObjectTileRangeStartByTag + bl GetSpriteTileStartByTag lsls r0, 16 ldr r1, _08140914 cmp r0, r1 @@ -405986,7 +405986,7 @@ sub_8140930: @ 8140930 lsls r0, 3 ldr r4, _081409D4 adds r0, r4 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r4, r0, 4 @@ -405999,7 +405999,7 @@ sub_8140930: @ 8140930 ldrb r1, [r0] adds r0, r2, 0 str r2, [sp] - bl StartObjectImageAnim + bl StartSpriteAnim adds r5, 0x1C adds r4, r5 ldr r0, _081409E0 @@ -406155,7 +406155,7 @@ _08140AA8: ldr r1, [sp] ldr r2, [sp, 0x4] ldr r3, [sp, 0xC] - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -406166,7 +406166,7 @@ _08140AA8: mov r2, r9 ldrb r1, [r2] adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r3, _08140B34 adds r1, r5, r3 ldr r0, _08140B38 @@ -406259,7 +406259,7 @@ _08140B80: ldr r1, [sp] ldr r2, [sp, 0x4] ldr r3, [sp, 0xC] - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -406270,7 +406270,7 @@ _08140B80: mov r2, r9 ldrb r1, [r2] adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r3, _08140C0C adds r1, r5, r3 ldr r0, _08140C10 @@ -406363,7 +406363,7 @@ _08140C58: ldr r1, [sp] ldr r2, [sp, 0x4] ldr r3, [sp, 0xC] - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -406374,7 +406374,7 @@ _08140C58: mov r2, r9 ldrb r1, [r2] adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r3, _08140CE0 adds r1, r5, r3 ldr r0, _08140CE4 @@ -406466,7 +406466,7 @@ _08140D2C: ldr r1, [sp] ldr r2, [sp, 0x4] ldr r3, [sp, 0xC] - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -406477,7 +406477,7 @@ _08140D2C: mov r2, r9 ldrb r1, [r2] adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r3, _08140DBC adds r1, r5, r3 ldr r0, _08140DC0 @@ -406584,7 +406584,7 @@ _08140E20: ldr r1, [sp] ldr r2, [sp, 0x4] ldr r3, [sp, 0xC] - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -406595,7 +406595,7 @@ _08140E20: mov r3, r9 ldrb r1, [r3] adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r0, _08140EC0 adds r1, r5, r0 ldr r0, _08140EC4 @@ -406747,7 +406747,7 @@ _08140F68: ldr r1, [sp] ldr r2, [sp, 0x4] ldr r3, [sp, 0xC] - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -406758,7 +406758,7 @@ _08140F68: mov r2, r9 ldrb r1, [r2] adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r3, _08140FF0 adds r1, r5, r3 ldr r0, _08140FF4 @@ -406904,7 +406904,7 @@ _081410A6: ldr r1, [sp, 0x4] ldr r2, [sp, 0x8] ldr r3, [sp, 0x10] - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r6, r0, 24 lsls r4, r6, 4 @@ -406915,7 +406915,7 @@ _081410A6: mov r0, r10 ldrb r1, [r0] adds r0, r5, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r1, _08141114 adds r4, r1 ldr r0, _08141118 @@ -407029,7 +407029,7 @@ _081411A8: ldr r1, [sp] ldr r2, [sp, 0x4] ldr r3, [sp, 0xC] - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -407040,7 +407040,7 @@ _081411A8: mov r2, r9 ldrb r1, [r2] adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r3, _08141228 adds r1, r5, r3 ldr r0, _0814122C @@ -407153,7 +407153,7 @@ sub_8141294: @ 8141294 cmp r0, 0x1 bne _081412F2 adds r0, r5, 0 - bl RemoveObjectAndFreeResources + bl DestroySpriteAndFreeResources b _0814130E .align 2, 0 _081412B8: .4byte 0x03001770 @@ -407175,9 +407175,9 @@ _081412C0: ldr r4, _08141304 _081412DC: ldrh r0, [r6, 0x6] - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag ldrh r0, [r4, 0x4] - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag adds r6, 0x8 adds r4, 0x8 adds r7, 0x1 @@ -407185,7 +407185,7 @@ _081412DC: ble _081412DC _081412F2: adds r0, r5, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite b _0814130E .align 2, 0 _081412FC: .4byte 0x02017840 @@ -407193,7 +407193,7 @@ _08141300: .4byte gUnknown_0840B258 _08141304: .4byte gUnknown_0840B2B8 _08141308: adds r0, r5, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _0814130E: pop {r4-r7} pop {r0} @@ -407903,7 +407903,7 @@ _08141882: cmp r0, 0 beq _081418FC ldr r0, _081418E8 - bl GetObjectTileRangeStartByTag + bl GetSpriteTileStartByTag lsls r0, 16 lsrs r0, 16 cmp r0, r7 @@ -408028,7 +408028,7 @@ _08141966: ldr r0, _0814199C adds r1, r5, 0 movs r3, 0x5 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r5, r0, 24 b _08141A02 @@ -408043,7 +408043,7 @@ _081419A0: ldr r0, _081419CC adds r1, r5, 0 movs r3, 0x5 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r5, r0, 24 ldr r0, _081419D0 @@ -408063,7 +408063,7 @@ _081419D4: ldr r0, _08141A2C adds r1, r5, 0 movs r3, 0x5 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r5, r0, 24 ldr r0, _08141A30 @@ -408257,9 +408257,9 @@ sub_8141B20: @ 8141B20 subs r1, 0x1 strh r1, [r0, 0x20] adds r0, r4, 0 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _08141B6A: pop {r4} pop {r0} @@ -408309,9 +408309,9 @@ _08141B88: subs r1, 0x1 strh r1, [r0, 0x20] adds r0, r4, 0 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _08141BCA: pop {r4} pop {r0} @@ -408331,7 +408331,7 @@ sub_8141BD4: @ 8141BD4 ldr r0, _08141C00 bl LoadCompressedObjectPalette ldr r0, _08141C04 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag adds r0, r4, 0 bl move_anim_task_del pop {r4} @@ -408351,9 +408351,9 @@ sub_8141C08: @ 8141C08 lsrs r4, 24 ldr r5, _08141C2C adds r0, r5, 0 - bl FreeObjectTilesByTag + bl FreeSpriteTilesByTag adds r0, r5, 0 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag adds r0, r4, 0 bl move_anim_task_del pop {r4,r5} @@ -408409,7 +408409,7 @@ sub_8141C30: @ 8141C30 ldr r1, _08141CB4 adds r0, r1 movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim ldr r0, _08141CB8 str r0, [r4, 0x1C] pop {r4,r5} @@ -408513,7 +408513,7 @@ sub_8141D20: @ 8141D20 lsls r0, 2 adds r0, r5 movs r1, 0 - bl StartObjectImageAnim + bl StartSpriteAnim adds r0, r4, 0 bl move_anim_8072740 _08141D68: @@ -408628,8 +408628,8 @@ _08141E34: .4byte 0x0202f7c9 thumb_func_start sub_8141E38 sub_8141E38: @ 8141E38 push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -408639,8 +408639,8 @@ sub_8141E38: @ 8141E38 sub_8141E4C: @ 8141E4C push {lr} bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r0} bx r0 @@ -410069,8 +410069,8 @@ _081429B4: .4byte gUnknown_0840B57C _081429B8: .4byte 0x03001770 _081429BC: .4byte 0x0000043c _081429C0: - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably bl sub_80C5DCC lsls r0, 24 @@ -410639,12 +410639,12 @@ _08142E30: adds r4, r0 ldrb r0, [r4, 0x5] lsrs r0, 4 - bl gpu_pal_tag_by_index + bl GetSpritePaletteTagByPaletteNum lsls r0, 16 lsrs r0, 16 - bl FreeObjectPaletteByTag + bl FreeSpritePaletteByTag adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _08142E5E: adds r0, r5, 0x1 lsls r0, 16 @@ -411531,8 +411531,8 @@ sub_8143570: @ 8143570 push {r4,lr} bl remove_some_task bl ResetTasks - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes ldr r1, _081435A8 movs r0, 0x8 strb r0, [r1] @@ -411782,7 +411782,7 @@ sub_81436BC: @ 81436BC lsrs r3, 24 mov r1, r9 mov r2, r10 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r1, _081437A0 @@ -411876,7 +411876,7 @@ sub_81437A4: @ 81437A4 asrs r2, 16 mov r10, r2 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r1, _08143868 @@ -411916,7 +411916,7 @@ sub_814386C: @ 814386C cmp r0, 0x78 ble _08143882 adds r0, r5, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite b _081438BA _08143882: adds r0, r1, 0x1 @@ -411980,7 +411980,7 @@ sub_81438C4: @ 81438C4 asrs r2, 16 adds r1, r4, 0 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -411997,7 +411997,7 @@ sub_81438C4: @ 81438C4 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim bl Random movs r1, 0x3 ands r1, r0 @@ -412021,8 +412021,8 @@ _0814393E: thumb_func_start sub_8143948 sub_8143948: @ 8143948 push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -412032,8 +412032,8 @@ sub_8143948: @ 8143948 sub_814395C: @ 814395C push {lr} bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably ldr r0, _081439B8 ldrh r1, [r0, 0x2C] @@ -412058,8 +412058,8 @@ sub_814395C: @ 814395C bne _081439B2 bl sub_8143948 bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably ldr r1, _081439CC movs r0, 0x1 @@ -412481,8 +412481,8 @@ sub_8143D04: @ 8143D04 cmp r7, 0x1 beq _08143E0C _08143D24: - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes ldr r1, _08143DD0 movs r0, 0x8 strb r0, [r1] @@ -412548,9 +412548,9 @@ _08143D88: adds r0, r1, 0 strh r0, [r2, 0x6] adds r0, r6, 0 - bl LoadObjectPic + bl LoadSpriteSheet ldr r0, _08143E08 - bl LoadTaggedObjectPalette + bl LoadSpritePalette ldr r1, _08143DC8 ldr r2, _08143DCC adds r1, r2 @@ -412743,8 +412743,8 @@ sub_8143F3C: @ 8143F3C movs r0, 0 movs r2, 0 bl sub_8145128 - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes movs r0, 0x1 negs r0, r0 movs r4, 0 @@ -414747,8 +414747,8 @@ _08144EF0: strh r1, [r0] adds r0, 0x2 strh r1, [r0] - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes movs r0, 0x1 strb r0, [r6] b _081450A2 @@ -414785,7 +414785,7 @@ _08144F5C: ldr r0, _08144FC8 bl LoadCompressedObjectPic ldr r0, _08144FCC - bl LoadTaggedObjectPalettes + bl LoadSpritePalettes movs r0, 0x78 movs r1, 0x2E bl sub_8149310 @@ -414833,7 +414833,7 @@ _08144FE0: ldr r0, _08145064 bl LoadCompressedObjectPic ldr r0, _08145068 - bl LoadTaggedObjectPalettes + bl LoadSpritePalettes movs r0, 0x78 movs r1, 0x2E bl sub_8149368 @@ -415289,7 +415289,7 @@ sub_8145378: @ 8145378 cmp r0, 0 beq _08145394 adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite b _08145418 .align 2, 0 _08145390: .4byte 0x0203935c @@ -415316,7 +415316,7 @@ _081453AC: _081453C4: adds r0, r4, 0 movs r1, 0 - bl StartObjectImageAnimIfDifferent + bl StartSpriteAnimIfDifferent b _08145418 _081453CE: adds r0, r4, 0 @@ -415325,17 +415325,17 @@ _081453CE: _081453D4: adds r0, r4, 0 movs r1, 0x2 - bl StartObjectImageAnimIfDifferent + bl StartSpriteAnimIfDifferent b _08145418 _081453DE: adds r0, r4, 0 movs r1, 0x3 - bl StartObjectImageAnimIfDifferent + bl StartSpriteAnimIfDifferent b _08145418 _081453E8: adds r0, r4, 0 movs r1, 0 - bl StartObjectImageAnimIfDifferent + bl StartSpriteAnimIfDifferent ldrh r1, [r4, 0x20] movs r2, 0x20 ldrsh r0, [r4, r2] @@ -415347,7 +415347,7 @@ _081453FE: adds r0, r4, 0 movs r1, 0 _08145402: - bl StartObjectImageAnimIfDifferent + bl StartSpriteAnimIfDifferent ldrh r2, [r4, 0x20] movs r0, 0x20 ldrsh r1, [r4, r0] @@ -415374,7 +415374,7 @@ sub_8145420: @ 8145420 cmp r0, 0 beq _0814543C adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite b _081454D8 .align 2, 0 _08145438: .4byte 0x0203935c @@ -415398,7 +415398,7 @@ _08145458: strh r0, [r4, 0x26] adds r0, r4, 0 movs r1, 0 - bl StartObjectImageAnimIfDifferent + bl StartSpriteAnimIfDifferent b _081454D8 _08145464: movs r1, 0x20 @@ -415407,12 +415407,12 @@ _08145464: ble _08145476 adds r0, r4, 0 movs r1, 0x1 - bl StartObjectImageAnimIfDifferent + bl StartSpriteAnimIfDifferent b _0814547E _08145476: adds r0, r4, 0 movs r1, 0x2 - bl StartObjectImageAnimIfDifferent + bl StartSpriteAnimIfDifferent _0814547E: ldrh r2, [r4, 0x20] movs r0, 0x20 @@ -415437,7 +415437,7 @@ _081454A0: strh r0, [r4, 0x3C] adds r0, r4, 0 movs r1, 0 - bl StartObjectImageAnimIfDifferent + bl StartSpriteAnimIfDifferent ldrh r1, [r4, 0x3C] movs r0, 0x3 ands r0, r1 @@ -415449,7 +415449,7 @@ _081454A0: _081454BE: adds r0, r4, 0 movs r1, 0 - bl StartObjectImageAnimIfDifferent + bl StartSpriteAnimIfDifferent ldrh r2, [r4, 0x20] movs r0, 0x20 ldrsh r1, [r4, r0] @@ -415477,7 +415477,7 @@ sub_81454E0: @ 81454E0 cmp r0, 0 beq _081454FC adds r0, r5, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite b _081456A6 .align 2, 0 _081454F8: .4byte 0x0203935c @@ -415542,7 +415542,7 @@ _08145544: adds r0, r4, 0 movs r2, 0 movs r3, 0 - bl SetSpriteTransformationMatrix + bl SetOamMatrix adds r2, r5, 0 adds r2, 0x3E ldrb r1, [r2] @@ -415577,7 +415577,7 @@ _0814559E: adds r0, r4, 0 movs r2, 0 movs r3, 0 - bl SetSpriteTransformationMatrix + bl SetOamMatrix b _081455DA _081455D4: ldrh r0, [r5, 0x2E] @@ -415693,7 +415693,7 @@ _08145696: adds r0, 0x2 strh r1, [r0] adds r0, r5, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _081456A6: add sp, 0x4 pop {r4,r5} @@ -415792,7 +415792,7 @@ _081456FC: lsls r2, r3, 16 asrs r2, 16 movs r3, 0 - bl AddObjectToFront + bl CreateSprite adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -415833,7 +415833,7 @@ _081456FC: movs r7, 0x22 ldrsh r2, [r3, r7] movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -415843,7 +415843,7 @@ _081456FC: adds r0, r5 strh r4, [r0, 0x2E] adds r1, r6, 0 - bl StartObjectImageAnimIfDifferent + bl StartSpriteAnimIfDifferent adds r0, r4, 0 add sp, 0x14 pop {r3-r5} @@ -415887,7 +415887,7 @@ sub_814580C: @ 814580C beq _08145840 _08145830: adds r0, r3, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite b _081458D4 .align 2, 0 _08145838: .4byte 0x02020004 @@ -416574,8 +416574,8 @@ sub_8145D64: @ 8145D64 thumb_func_start sub_8145D74 sub_8145D74: @ 8145D74 push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -416654,9 +416654,9 @@ sub_8145D88: @ 8145D88 bl LZ77UnCompVram bl remove_some_task bl ResetTasks - bl ResetAllObjectData + bl ResetSpriteData bl sub_8073B94 - bl ResetObjectPaletteAllocator + bl FreeAllSpritePalettes ldr r0, _08145ED0 movs r1, 0 movs r2, 0x40 @@ -416740,8 +416740,8 @@ _08145EF8: .4byte sub_8145F14 sub_8145EFC: @ 8145EFC push {lr} bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r0} bx r0 @@ -416878,8 +416878,8 @@ _08146010: .4byte gUnknown_0842D22B thumb_func_start sub_8146014 sub_8146014: @ 8146014 push {lr} - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl RunTasks bl fade_and_return_progress_probably pop {r0} @@ -416895,8 +416895,8 @@ sub_814602C: @ 814602C strh r1, [r2] ldr r0, _08146054 strh r1, [r0] - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -416968,7 +416968,7 @@ _081460E4: .4byte 0x0202f388 _081460E8: .4byte 0x03001770 _081460EC: .4byte 0x0000043c _081460F0: - bl ResetAllObjectData + bl ResetSpriteData b _0814620C _081460F6: ldr r0, _08146104 @@ -417686,7 +417686,7 @@ _081466AA: lsls r0, 2 ldr r1, _081466E0 adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite ldr r0, _081466E4 strh r0, [r4] _081466CA: @@ -417936,7 +417936,7 @@ _08146870: lsls r0, 2 ldr r1, _081468B8 adds r0, r1 - bl RemoveObjectAndFreeTiles + bl DestroySprite bl sub_81466A0 bl sub_80A7DD4 pop {r4-r6} @@ -417984,8 +417984,8 @@ _081468FC: .4byte 0x0203932c thumb_func_start sub_8146900 sub_8146900: @ 8146900 push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -418012,8 +418012,8 @@ _0814692C: .4byte 0x03002970 thumb_func_start sub_8146930 sub_8146930: @ 8146930 push {r4,lr} - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes bl ResetTasks ldr r0, _0814699C bl SetVBlankCallback @@ -418037,8 +418037,8 @@ sub_8146930: @ 8146930 bl CreateTask bl sub_8074D08 bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably movs r0, 0 movs r1, 0 @@ -418538,8 +418538,8 @@ _08146DA4: strb r1, [r0] _08146DE4: bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably add sp, 0x8 pop {r4-r6} @@ -418578,8 +418578,8 @@ _08146E38: .4byte 0x0203933e thumb_func_start sub_8146E3C sub_8146E3C: @ 8146E3C push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -418674,7 +418674,7 @@ _08146E6C: ldr r0, _08146FE4 ldr r1, _08146FE8 bl LZ77UnCompVram - bl ResetAllObjectData + bl ResetSpriteData bl ResetTasks bl sub_8073B94 ldr r0, _08146FEC @@ -419830,8 +419830,8 @@ _0814788C: .4byte 0x03004b20 thumb_func_start sub_8147890 sub_8147890: @ 8147890 push {lr} - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl RunTasks bl fade_and_return_progress_probably pop {r0} @@ -419841,8 +419841,8 @@ sub_8147890: @ 8147890 thumb_func_start sub_81478A8 sub_81478A8: @ 81478A8 push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -419907,7 +419907,7 @@ _08147938: .align 2, 0 _08147948: .4byte 0x0202f388 _0814794C: - bl ResetAllObjectData + bl ResetSpriteData ldr r1, _08147958 ldr r2, _0814795C adds r1, r2 @@ -419916,7 +419916,7 @@ _0814794C: _08147958: .4byte 0x03001770 _0814795C: .4byte 0x0000043c _08147960: - bl ResetObjectPaletteAllocator + bl FreeAllSpritePalettes b _08147A44 _08147966: ldr r0, _08147974 @@ -420671,7 +420671,7 @@ sub_8147F84: @ 8147F84 movs r1, 0x30 movs r2, 0x50 movs r3, 0x2 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 mov r8, r0 @@ -420721,7 +420721,7 @@ sub_8147F84: @ 8147F84 lsls r3, 30 lsrs r3, 30 adds r0, r6, 0 - bl CalcVecFromObjectCenterToObjectUpperLeft + bl CalcCenterToCornerVec movs r0, 0 mov r1, r9 strb r0, [r1] @@ -420739,7 +420739,7 @@ _08148028: .4byte 0x03005f24 _0814802C: .4byte 0x03005f2c _08148030: .4byte 0x03005f30 _08148034: .4byte 0x02020004 -_08148038: .4byte nullsub_2 +_08148038: .4byte SpriteCallbackDummy _0814803C: .4byte 0x03005f28 _08148040: .4byte gUnknown_084120EC thumb_func_end sub_8147F84 @@ -420804,7 +420804,7 @@ _081480AA: pop {r0} bx r0 .align 2, 0 -_081480B0: .4byte nullsub_2 +_081480B0: .4byte SpriteCallbackDummy thumb_func_end sub_8148078 thumb_func_start sub_81480B4 @@ -420838,7 +420838,7 @@ sub_81480B4: @ 81480B4 adds r3, r5 ldr r1, _08148104 str r1, [r3] - bl obj_alloc_rotscale_entry + bl InitSpriteAffineAnim adds r0, r4, 0 pop {r4,r5} pop {r1} @@ -420846,7 +420846,7 @@ sub_81480B4: @ 81480B4 .align 2, 0 _081480FC: .4byte 0x02020004 _08148100: .4byte gUnknown_084121A0 -_08148104: .4byte nullsub_2 +_08148104: .4byte SpriteCallbackDummy thumb_func_end sub_81480B4 thumb_func_start sub_8148108 @@ -420869,7 +420869,7 @@ sub_8148108: @ 8148108 ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix ldrb r0, [r4, 0x1] movs r1, 0x3 orrs r0, r1 @@ -420896,7 +420896,7 @@ _08148158: lsls r0, 2 ldr r1, _08148178 adds r0, r1 - bl obj_alloc_rotscale_entry + bl InitSpriteAffineAnim pop {r3} mov r8, r3 pop {r4-r7} @@ -420914,7 +420914,7 @@ sub_814817C: @ 814817C movs r1, 0xAE movs r2, 0x54 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r2, _081481A8 @@ -420953,7 +420953,7 @@ sub_81481B0: @ 81481B0 cmp r0, 0xA bne _081481D6 adds r0, r2, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _081481D6: pop {r0} bx r0 @@ -421195,7 +421195,7 @@ _0814843C: ldr r0, [r3] ldr r1, _081484B0 str r1, [r0, 0x10] - bl obj_alloc_rotscale_entry + bl InitSpriteAffineAnim _08148474: ldr r1, _081484B4 movs r0, 0x32 @@ -421219,7 +421219,7 @@ _0814847A: adds r1, 0xA lsls r1, 24 lsrs r1, 24 - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim b _081484EE .align 2, 0 _081484A4: .4byte gUnknown_08411A10 @@ -421232,7 +421232,7 @@ _081484BC: ldr r0, _081484C8 ldr r0, [r0] ldrb r1, [r2] - bl StartObjectRotScalAnim + bl StartSpriteAffineAnim b _081484EE .align 2, 0 _081484C8: .4byte 0x03005f20 @@ -421267,7 +421267,7 @@ _08148504: ldrb r0, [r0, 0x3] lsls r0, 26 lsrs r0, 27 - bl rotscale_free_entry + bl FreeOamMatrix ldr r1, _08148520 movs r0, 0x46 strb r0, [r1] @@ -421406,7 +421406,7 @@ sub_8148618: @ 8148618 push {lr} ldr r0, _08148628 ldr r0, [r0] - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix movs r0, 0 pop {r1} bx r1 @@ -421674,8 +421674,8 @@ _08148818: .4byte sub_8148830 thumb_func_start sub_814881C sub_814881C: @ 814881C push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -421688,7 +421688,7 @@ sub_8148830: @ 8148830 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - bl ResetAllObjectData + bl ResetSpriteData movs r1, 0x80 lsls r1, 19 movs r2, 0xCA @@ -421790,8 +421790,8 @@ _0814890C: ldr r0, _0814892C bl SetMainCallback2 _0814891E: - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer pop {r4} pop {r0} bx r0 @@ -421940,7 +421940,7 @@ _08148A2C: cmp r1, r2 bls _08148A2C bl ResetTasks - bl ResetAllObjectData + bl ResetSpriteData ldr r0, _08148AE0 bl ShowBg ldr r0, _08148AE4 @@ -422713,7 +422713,7 @@ sub_814910C: @ 814910C cmp r0, 0 beq _08149128 adds r0, r2, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite b _0814916C .align 2, 0 _08149124: .4byte 0x0203935c @@ -422791,7 +422791,7 @@ _0814919E: ldrb r2, [r6, 0x2] ldrb r3, [r6, 0x3] ldr r0, _08149240 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 lsls r5, r0, 4 @@ -422805,7 +422805,7 @@ _0814919E: lsrs r2, 6 adds r0, r4, 0 movs r3, 0 - bl CalcVecFromObjectCenterToObjectUpperLeft + bl CalcCenterToCornerVec ldrb r3, [r4, 0x5] movs r0, 0xC orrs r3, r0 @@ -422838,7 +422838,7 @@ _0814919E: lsls r1, 28 lsrs r1, 28 adds r0, r4, 0 - bl StartObjectImageAnim + bl StartSpriteAnim movs r1, 0 mov r0, sp ldrh r0, [r0] @@ -422988,7 +422988,7 @@ sub_8149310: @ 8149310 adds r1, r5, 0 adds r2, r4, 0 movs r3, 0 - bl AddObjectToFront + bl CreateSprite adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 @@ -422999,7 +422999,7 @@ sub_8149310: @ 8149310 adds r1, r5, 0 adds r2, r4, 0 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r2, _08149364 @@ -423031,7 +423031,7 @@ sub_8149368: @ 8149368 adds r1, r5, 0 adds r2, r4, 0 movs r3, 0 - bl AddObjectToFront + bl CreateSprite adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 @@ -423042,7 +423042,7 @@ sub_8149368: @ 8149368 adds r1, r5, 0 adds r2, r4, 0 movs r3, 0x1 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r2, _081493BC @@ -423138,7 +423138,7 @@ sub_8149424: @ 8149424 adds r1, r2, 0 adds r2, r5, 0 movs r3, 0x2 - bl AddObjectToFront + bl CreateSprite adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 @@ -423149,7 +423149,7 @@ sub_8149424: @ 8149424 adds r1, r4, 0 adds r2, r5, 0 movs r3, 0x2 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r5, _08149498 @@ -423159,7 +423159,7 @@ sub_8149424: @ 8149424 adds r0, r4, r5 strh r6, [r0, 0x2E] movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim adds r5, 0x1C adds r4, r5 ldr r0, _0814949C @@ -423197,7 +423197,7 @@ sub_81494A0: @ 81494A0 adds r1, r2, 0 adds r2, r5, 0 movs r3, 0x2 - bl AddObjectToFront + bl CreateSprite adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 @@ -423208,7 +423208,7 @@ sub_81494A0: @ 81494A0 adds r1, r4, 0 adds r2, r5, 0 movs r3, 0x2 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 ldr r5, _08149514 @@ -423218,7 +423218,7 @@ sub_81494A0: @ 81494A0 adds r0, r4, r5 strh r6, [r0, 0x2E] movs r1, 0x1 - bl StartObjectImageAnim + bl StartSpriteAnim adds r5, 0x1C adds r4, r5 ldr r0, _08149518 @@ -423258,7 +423258,7 @@ _08149528: str r1, [sp] movs r2, 0 movs r3, 0 - bl SetSpriteTransformationMatrix + bl SetOamMatrix adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -423366,7 +423366,7 @@ _081495F2: b _0814960C _08149606: adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _0814960C: pop {r4} pop {r0} @@ -423382,7 +423382,7 @@ sub_8149614: @ 8149614 movs r1, 0x78 movs r2, 0x58 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -423473,7 +423473,7 @@ _081496A8: b _081496DC _081496D6: adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _081496DC: pop {r4} pop {r0} @@ -423489,7 +423489,7 @@ sub_81496E4: @ 81496E4 movs r1, 0x78 movs r2, 0x8 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -423566,7 +423566,7 @@ sub_814974C: @ 814974C b _0814978E _08149788: adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _0814978E: pop {r4} pop {r0} @@ -423584,7 +423584,7 @@ sub_8149794: @ 8149794 movs r1, 0x78 movs r2, 0x38 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -423732,7 +423732,7 @@ _081498A6: b _081498C6 _081498C0: adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite _081498C6: pop {r4,r5} pop {r0} @@ -423748,7 +423748,7 @@ sub_81498CC: @ 81498CC movs r1, 0x78 movs r2, 0x38 movs r3, 0 - bl AddObjectToFront + bl CreateSprite lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x40 @@ -423811,7 +423811,7 @@ sub_8149954: @ 8149954 ldr r0, _08149968 bl LoadCompressedObjectPic ldr r0, _0814996C - bl LoadTaggedObjectPalettes + bl LoadSpritePalettes pop {r0} bx r0 .align 2, 0 @@ -424551,7 +424551,7 @@ _08149E96: movs r0, 0x1E movs r2, 0 movs r3, 0 - bl SetSpriteTransformationMatrix + bl SetOamMatrix movs r0, 0x10 ldrsh r1, [r6, r0] adds r0, r4, 0 @@ -424563,7 +424563,7 @@ _08149E96: movs r0, 0x1F movs r2, 0 movs r3, 0 - bl SetSpriteTransformationMatrix + bl SetOamMatrix ldr r1, _08149FBC mov r9, r1 lsls r2, r5, 4 @@ -424850,7 +424850,7 @@ _0814A102: movs r0, 0x1E movs r2, 0 movs r3, 0 - bl SetSpriteTransformationMatrix + bl SetOamMatrix movs r3, 0x10 ldrsh r1, [r5, r3] adds r0, r4, 0 @@ -424862,7 +424862,7 @@ _0814A102: movs r0, 0x1F movs r2, 0 movs r3, 0 - bl SetSpriteTransformationMatrix + bl SetOamMatrix cmp r6, 0x2 bne _0814A14C ldr r0, _0814A154 @@ -425501,7 +425501,7 @@ _0814A5F6: adds r0, r1 strh r7, [r0] ldr r0, _0814A688 - bl LoadTaggedObjectPalette + bl LoadSpritePalette lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF @@ -425515,7 +425515,7 @@ _0814A61C: lsls r0, 3 ldr r1, _0814A690 adds r0, r1 - bl sub_8002594 + bl LoadSpriteSheetDeferred lsls r0, r4, 1 adds r0, r4 lsls r0, 3 @@ -425524,7 +425524,7 @@ _0814A61C: movs r1, 0 movs r2, 0xA0 mov r3, r8 - bl AddObjectToFront + bl CreateSprite ldr r5, _0814A678 strb r0, [r5] adds r4, 0x30 @@ -425532,7 +425532,7 @@ _0814A61C: movs r1, 0 movs r2, 0xA0 mov r3, r8 - bl AddObjectToFront + bl CreateSprite ldr r1, _0814A67C strb r0, [r1] ldrb r0, [r5] @@ -425564,7 +425564,7 @@ _0814A694: .4byte gUnknown_0842F250 _0814A698: .4byte 0x02020004 _0814A69C: adds r0, r6, 0 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 4 ldrb r2, [r4, 0x5] adds r1, r7, 0 @@ -425596,7 +425596,7 @@ _0814A6D8: .4byte 0x02020004 _0814A6DC: .4byte 0x0000ffff _0814A6E0: adds r0, r6, 0 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 4 ldrb r2, [r4, 0x5] movs r1, 0xF @@ -425751,14 +425751,14 @@ sub_814A7FC: @ 814A7FC cmp r0, 0x40 beq _0814A820 ldr r0, _0814A864 - bl sub_8002370 + bl LoadTilesForSpriteSheet ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 ldr r1, _0814A868 adds r0, r1 - bl RemoveObjectAndFreeResources + bl DestroySpriteAndFreeResources movs r0, 0x40 strb r0, [r4] _0814A820: @@ -425772,7 +425772,7 @@ _0814A820: lsls r0, 2 ldr r1, _0814A868 adds r0, r1 - bl RemoveObjectAndFreeResources + bl DestroySpriteAndFreeResources movs r0, 0x40 strb r0, [r4] ldr r0, _0814A870 @@ -426065,7 +426065,7 @@ _0814AA3A: ldr r0, _0814AAB4 adds r1, r0 adds r0, r2, 0 - bl SetSpriteOamTables_NoPriorityFromTable + bl SetSubspriteTables _0814AA78: ldr r1, _0814AAB8 ldrb r0, [r1] @@ -426081,7 +426081,7 @@ _0814AA78: ldr r0, _0814AAB4 adds r1, r0 adds r0, r2, 0 - bl SetSpriteOamTables_NoPriorityFromTable + bl SetSubspriteTables _0814AA98: add sp, 0x4 pop {r3-r5} @@ -426190,7 +426190,7 @@ _0814AB46: ands r3, r1 lsls r0, r3, 3 add r0, r8 - bl sub_800256C + bl RequestSpriteSheetCopy _0814AB66: pop {r3} mov r8, r3 @@ -426218,9 +426218,9 @@ sub_814AB84: @ 814AB84 ldr r0, _0814ABD0 adds r4, r0 adds r0, r4, 0 - bl obj_free_rotscale_entry + bl FreeSpriteOamMatrix adds r0, r4, 0 - bl RemoveObjectAndFreeTiles + bl DestroySprite movs r0, 0x40 strb r0, [r5] ldr r0, _0814ABD4 @@ -426276,7 +426276,7 @@ sub_814ABE4: @ 814ABE4 ldr r0, _0814AC50 adds r1, r0 adds r0, r2, 0 - bl SetSpriteOamTables_NoPriorityFromTable + bl SetSubspriteTables _0814AC18: ldr r1, _0814AC54 ldrb r0, [r1] @@ -426292,7 +426292,7 @@ _0814AC18: ldr r0, _0814AC50 adds r1, r0 adds r0, r2, 0 - bl SetSpriteOamTables_NoPriorityFromTable + bl SetSubspriteTables _0814AC38: pop {r4} pop {r0} @@ -426342,7 +426342,7 @@ _0814AC86: adds r0, r1 strh r6, [r0] ldr r0, _0814AD04 - bl LoadTaggedObjectPalette + bl LoadSpritePalette lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF @@ -426356,7 +426356,7 @@ _0814ACAC: lsls r0, 3 ldr r1, _0814AD0C adds r0, r1 - bl sub_8002594 + bl LoadSpriteSheetDeferred lsls r0, r4, 1 adds r0, r4 lsls r0, 3 @@ -426365,7 +426365,7 @@ _0814ACAC: movs r1, 0 movs r2, 0xA0 mov r3, r8 - bl AddObjectToFront + bl CreateSprite ldr r1, _0814ACF8 strb r0, [r1] lsls r0, 24 @@ -426397,7 +426397,7 @@ _0814AD10: .4byte gUnknown_0842F298 _0814AD14: .4byte 0x02020004 _0814AD18: adds r0, r5, 0 - bl IndexOfObjectPaletteTag + bl IndexOfSpritePaletteTag lsls r0, 4 ldrb r2, [r4, 0x5] adds r1, r6, 0 @@ -426427,14 +426427,14 @@ sub_814AD44: @ 814AD44 cmp r0, 0x40 beq _0814AD68 ldr r0, _0814AD74 - bl sub_8002370 + bl LoadTilesForSpriteSheet ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 ldr r1, _0814AD78 adds r0, r1 - bl RemoveObjectAndFreeResources + bl DestroySpriteAndFreeResources movs r0, 0x40 strb r0, [r4] _0814AD68: @@ -426536,7 +426536,7 @@ _0814AE00: lsls r1, r2, 3 ldr r2, _0814AE2C adds r1, r2 - bl SetSpriteOamTables_NoPriorityFromTable + bl SetSubspriteTables _0814AE1E: pop {r0} bx r0 diff --git a/data/data2.s b/data/data2.s index 53a994412..4c3a1f892 100644 --- a/data/data2.s +++ b/data/data2.s @@ -5,78 +5,6 @@ .section .rodata -@ Unreferenced error message. -@ It means "The DMA transfer request table has exceeded its limit." - .string "DMA OVER\n" - .string "DMAてんそう\n" - .string "リクエストテーブルが\n" - .string "オーバーしました$" - -@ 81E2881 - .incbin "baserom.gba", 0x1E2881, 0x18 - - .global gUnknown_081E2899 -gUnknown_081E2899: @ 81E2899 - .incbin "baserom.gba", 0x001e2899, 0x1b - - .global gUnknown_081E28B4 -gUnknown_081E28B4: @ 81E28B4 - .incbin "baserom.gba", 0x001e28b4, 0x44 - -@ off-screen and low priority relative to background - .align 2 - .global gDummyBaseOam -gDummyBaseOam: @ 81E28F8 - .2byte 160 @ Y - .2byte 304 @ X - .2byte 3 << 10 @ priority - - .align 2 -gDummyObjectImageAnim: @ 81E2900 - obj_image_anim_end - - .align 2 - .global gDummyObjectImageAnimTable -gDummyObjectImageAnimTable: @ 81E2904 - .4byte gDummyObjectImageAnim - - .align 2 -gDummyObjectRotScalAnim: @ 81E2908 - obj_rot_scal_anim_end - - .align 2 - .global gDummyObjectRotScalAnimTable -gDummyObjectRotScalAnimTable: @ 81E2910 - .4byte gDummyObjectRotScalAnim - - .global gUnknown_081E2914 -gUnknown_081E2914: @ 81E2914 - .incbin "baserom.gba", 0x001e2914, 0x18 - - .global gUnknown_081E292C -gUnknown_081E292C: @ 81E292C - .incbin "baserom.gba", 0x001e292c, 0x14 - - .global gUnknown_081E2940 -gUnknown_081E2940: @ 81E2940 - .incbin "baserom.gba", 0x001e2940, 0x8 - - .global gUnknown_081E2948 -gUnknown_081E2948: @ 81E2948 - .incbin "baserom.gba", 0x001e2948, 0x8 - - .global gUnknown_081E2950 -gUnknown_081E2950: @ 81E2950 - .incbin "baserom.gba", 0x001e2950, 0x10 - - .global gUnknown_081E2960 -gUnknown_081E2960: @ 81E2960 - .incbin "baserom.gba", 0x001e2960, 0x10 - - .global gUnknown_081E2970 -gUnknown_081E2970: @ 81E2970 - .incbin "baserom.gba", 0x001e2970, 0x38 - .global gUnknown_081E29A8 gUnknown_081E29A8: @ 81E29A8 .incbin "baserom.gba", 0x001e29a8, 0x10 diff --git a/data/graphics/field_objects/field_effect_objects.s b/data/graphics/field_objects/field_effect_objects.s index 7c90cb6c7..22f5f0b62 100644 --- a/data/graphics/field_objects/field_effect_objects.s +++ b/data/graphics/field_objects/field_effect_objects.s @@ -49,7 +49,7 @@ gFieldEffectObjectTemplate_ShadowSmall: @ 8374560 .4byte gFieldObjectBaseOam_8x8 .4byte gFieldEffectObjectImageAnimTable_Shadow .4byte gFieldEffectObjectPicTable_ShadowSmall - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte oamc_shadow .align 2 @@ -60,7 +60,7 @@ gFieldEffectObjectTemplate_ShadowMedium: @ 8374578 .4byte gFieldObjectBaseOam_16x8 .4byte gFieldEffectObjectImageAnimTable_Shadow .4byte gFieldEffectObjectPicTable_ShadowMedium - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte oamc_shadow .align 2 @@ -71,7 +71,7 @@ gFieldEffectObjectTemplate_ShadowLarge: @ 8374590 .4byte gFieldObjectBaseOam_32x8 .4byte gFieldEffectObjectImageAnimTable_Shadow .4byte gFieldEffectObjectPicTable_ShadowLarge - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte oamc_shadow .align 2 @@ -82,7 +82,7 @@ gFieldEffectObjectTemplate_ShadowExtraLarge: @ 83745A8 .4byte gFieldObjectBaseOam_64x32 .4byte gFieldEffectObjectImageAnimTable_Shadow .4byte gFieldEffectObjectPicTable_ShadowExtraLarge - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte oamc_shadow .align 2 @@ -117,7 +117,7 @@ gFieldEffectObjectTemplate_TallGrass: @ 8374604 .4byte gFieldObjectBaseOam_16x16 .4byte gFieldEffectObjectImageAnimTable_TallGrass .4byte gFieldEffectObjectPicTable_TallGrass - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte unc_grass_normal .align 2 @@ -155,7 +155,7 @@ gFieldEffectObjectTemplate_Ripple: @ 837466C .4byte gFieldObjectBaseOam_16x16 .4byte gFieldEffectObjectImageAnimTable_Ripple .4byte gFieldEffectObjectPicTable_Ripple - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte sub_8128800 .align 2 @@ -190,7 +190,7 @@ gFieldEffectObjectTemplate_Ash: @ 83746C8 .4byte gFieldObjectBaseOam_16x16 .4byte gFieldEffectObjectImageAnimTable_Ash .4byte gFieldEffectObjectPicTable_Ash - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte sub_8127D84 .align 2 @@ -240,7 +240,7 @@ gFieldEffectObjectTemplate_SurfBlob: @ 8374728 .4byte gFieldObjectBaseOam_32x32 .4byte gFieldEffectObjectImageAnimTable_SurfBlob .4byte gFieldEffectObjectPicTable_SurfBlob - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte sub_8127F7C .align 2 @@ -299,8 +299,8 @@ gFieldEffectObjectTemplate_Arrow: @ 83747C0 .4byte gFieldObjectBaseOam_16x16 .4byte gFieldEffectObjectImageAnimTable_Arrow .4byte gFieldEffectObjectPicTable_Arrow - .4byte gDummyObjectRotScalAnimTable - .4byte nullsub_2 + .4byte gDummySpriteAffineAnimTable + .4byte SpriteCallbackDummy .align 2 @@ -330,7 +330,7 @@ gFieldEffectObjectTemplate_Dust: @ 8374804 .4byte gFieldObjectBaseOam_16x8 .4byte gFieldEffectObjectImageAnimTable_Dust .4byte gFieldEffectObjectPicTable_Dust - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte sub_81287C4 .align 2 @@ -363,7 +363,7 @@ gFieldEffectObjectTemplate_JumpTallGrass: @ 8374854 .4byte gFieldObjectBaseOam_16x8 .4byte gFieldEffectObjectImageAnimTable_JumpTallGrass .4byte gFieldEffectObjectPicTable_JumpTallGrass - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte sub_81287C4 .align 2 @@ -413,7 +413,7 @@ gFieldEffectObjectTemplate_SandFootprints: @ 83748B0 .4byte gFieldObjectBaseOam_16x16 .4byte gFieldEffectObjectImageAnimTable_SandFootprints .4byte gFieldEffectObjectPicTable_SandFootprints - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte sub_8127584 .align 2 @@ -463,7 +463,7 @@ gFieldEffectObjectTemplate_DeepSandFootprints: @ 837490C .4byte gFieldObjectBaseOam_16x16 .4byte gFieldEffectObjectImageAnimTable_DeepSandFootprints .4byte gFieldEffectObjectPicTable_DeepSandFootprints - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte sub_8127584 .align 2 @@ -543,7 +543,7 @@ gFieldEffectObjectTemplate_BikeTireTracks: @ 83749A8 .4byte gFieldObjectBaseOam_16x16 .4byte gFieldEffectObjectImageAnimTable_BikeTireTracks .4byte gFieldEffectObjectPicTable_BikeTireTracks - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte sub_8127584 .align 2 @@ -576,7 +576,7 @@ gFieldEffectObjectTemplate_JumpBigSplash: @ 83749F8 .4byte gFieldObjectBaseOam_16x16 .4byte gFieldEffectObjectImageAnimTable_JumpBigSplash .4byte gFieldEffectObjectPicTable_JumpBigSplash - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte sub_81287C4 .align 2 @@ -619,7 +619,7 @@ gFieldEffectObjectTemplate_Splash: @ 8374A58 .4byte gFieldObjectBaseOam_16x8 .4byte gFieldEffectObjectImageAnimTable_Splash .4byte gFieldEffectObjectPicTable_Splash - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte sub_81276B4 .align 2 @@ -650,7 +650,7 @@ gFieldEffectObjectTemplate_JumpSmallSplash: @ 8374A9C .4byte gFieldObjectBaseOam_16x8 .4byte gFieldEffectObjectImageAnimTable_JumpSmallSplash .4byte gFieldEffectObjectPicTable_JumpSmallSplash - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte sub_81287C4 .align 2 @@ -686,7 +686,7 @@ gFieldEffectObjectTemplate_LongGrass: @ 8374AF8 .4byte gFieldObjectBaseOam_16x16 .4byte gFieldEffectObjectImageAnimTable_LongGrass .4byte gFieldEffectObjectPicTable_LongGrass - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte unc_grass_tall .align 2 @@ -723,7 +723,7 @@ gFieldEffectObjectTemplate_JumpLongGrass: @ 8374B60 .4byte gFieldObjectBaseOam_16x16 .4byte gFieldEffectObjectImageAnimTable_JumpLongGrass .4byte gFieldEffectObjectPicTable_JumpLongGrass - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte sub_81287C4 .align 2 @@ -766,7 +766,7 @@ gFieldEffectObjectTemplate_Unknown17: @ 8374BEC .4byte gFieldObjectBaseOam_16x16 .4byte gFieldEffectObjectImageAnimTable_Unknown17 .4byte gFieldEffectObjectPicTable_Unknown17 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte sub_8128800 .align 2 @@ -801,7 +801,7 @@ gFieldEffectObjectTemplate_Unknown18: @ 8374C44 .4byte gFieldObjectBaseOam_16x16 .4byte gFieldEffectObjectImageAnimTable_Unknown18 .4byte gFieldEffectObjectPicTable_Unknown18 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte sub_8128800 .align 2 @@ -834,7 +834,7 @@ gFieldEffectObjectTemplate_Unknown19: @ 8374C94 .4byte gFieldObjectBaseOam_16x16 .4byte gFieldEffectObjectImageAnimTable_Unknown19 .4byte gFieldEffectObjectPicTable_Unknown19 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte sub_8128800 .align 2 @@ -865,7 +865,7 @@ gFieldEffectObjectTemplate_Unknown29: @ 8374CD8 .4byte gFieldObjectBaseOam_16x8 .4byte gFieldEffectObjectImageAnimTable_Unknown29 .4byte gFieldEffectObjectPicTable_Unknown29 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte sub_81282E0 .align 2 @@ -900,7 +900,7 @@ gFieldEffectObjectTemplate_Unknown20: @ 8374D30 .4byte gFieldObjectBaseOam_16x16 .4byte gFieldEffectObjectImageAnimTable_Unknown20 .4byte gFieldEffectObjectPicTable_Unknown20 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte sub_8128800 .align 2 @@ -942,11 +942,11 @@ gFieldEffectObjectRotScalAnimTable_Unknown21: @ 8374DE8 gFieldEffectObjectTemplate_Unknown21: @ 8374DF0 .2byte 0x0 @ tiles tag .2byte 0xFFFF @ palette tag - .4byte gDummyBaseOam - .4byte gDummyObjectImageAnimTable + .4byte gDummyOamData + .4byte gDummySpriteAnimTable .4byte NULL .4byte gFieldEffectObjectRotScalAnimTable_Unknown21 - .4byte nullsub_2 + .4byte SpriteCallbackDummy .align 2 @@ -996,7 +996,7 @@ gFieldEffectObjectTemplate_BerryTreeGrowthSparkle: @ 8374E90 .4byte gFieldObjectBaseOam_16x16 .4byte gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle .4byte gFieldEffectObjectPicTable_BerryTreeGrowthSparkle - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte sub_8128800 .align 2 @@ -1042,7 +1042,7 @@ gFieldEffectObjectTemplate_TreeDisguise: @ 8374F10 .4byte gFieldObjectBaseOam_16x32 .4byte gFieldEffectObjectImageAnimTable_TreeDisguise .4byte gFieldEffectObjectPicTable_TreeDisguise - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte sub_81285AC .align 2 @@ -1088,7 +1088,7 @@ gFieldEffectObjectTemplate_MountainDisguise: @ 8374F90 .4byte gFieldObjectBaseOam_16x32 .4byte gFieldEffectObjectImageAnimTable_MountainDisguise .4byte gFieldEffectObjectPicTable_MountainDisguise - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte sub_81285AC .align 2 @@ -1110,7 +1110,7 @@ gFieldEffectObjectTemplate_SandDisguise: @ 8374FE0 .4byte gFieldObjectBaseOam_16x32 .4byte gFieldEffectObjectImageAnimTable_TreeDisguise .4byte gFieldEffectObjectPicTable_SandDisguise - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte sub_81285AC .align 2 @@ -1137,8 +1137,8 @@ gFieldEffectObjectTemplate_Bird: @ 837500C .4byte gFieldObjectBaseOam_32x32 .4byte gFieldEffectObjectImageAnimTable_Bird .4byte gFieldEffectObjectPicTable_Bird - .4byte gDummyObjectRotScalAnimTable - .4byte nullsub_2 + .4byte gDummySpriteAffineAnimTable + .4byte SpriteCallbackDummy .align 2 @@ -1166,7 +1166,7 @@ gFieldEffectObjectTemplate_ShortGrass: @ 8375044 .4byte gFieldObjectBaseOam_16x16 .4byte gFieldEffectObjectImageAnimTable_ShortGrass .4byte gFieldEffectObjectPicTable_ShortGrass - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte sub_8127334 .align 2 @@ -1193,7 +1193,7 @@ gFieldEffectObjectTemplate_HotSpringsWater: @ 8375070 .4byte gFieldObjectBaseOam_16x16 .4byte gFieldEffectObjectImageAnimTable_HotSpringsWater .4byte gFieldEffectObjectPicTable_HotSpringsWater - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte sub_8127A7C .align 2 @@ -1228,7 +1228,7 @@ gFieldEffectObjectTemplate_PopOutOfAsh: @ 83750CC .4byte gFieldObjectBaseOam_16x16 .4byte gFieldEffectObjectImageAnimTable_PopOutOfAsh .4byte gFieldEffectObjectPicTable_PopOutOfAsh - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte sub_808788C .align 2 @@ -1269,7 +1269,7 @@ gFieldEffectObjectTemplate_Unknown33: @ 8375130 .4byte gFieldObjectBaseOam_16x16 .4byte gFieldEffectObjectImageAnimTable_Unknown33 .4byte gFieldEffectObjectPicTable_Unknown33 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte sub_8087638 .align 2 @@ -1310,7 +1310,7 @@ gFieldEffectObjectTemplate_Bubbles: @ 83751B0 .4byte gFieldObjectBaseOam_16x32 .4byte gFieldEffectObjectImageAnimTable_Bubbles .4byte gFieldEffectObjectPicTable_Bubbles - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte sub_8128410 .align 2 @@ -1340,7 +1340,7 @@ gFieldEffectObjectTemplate_Unknown35: @ 83751EC .4byte gFieldObjectBaseOam_16x16 .4byte gFieldEffectObjectImageAnimTable_Unknown35 .4byte gFieldEffectObjectPicTable_Unknown35 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .4byte sub_8128774 .align 2 diff --git a/data/graphics/field_objects/map_object_graphics_info.s b/data/graphics/field_objects/map_object_graphics_info.s index bbef1909c..bb8683ad6 100644 --- a/data/graphics/field_objects/map_object_graphics_info.s +++ b/data/graphics/field_objects/map_object_graphics_info.s @@ -14,7 +14,7 @@ gMapObjectGraphicsInfo_BrendanNormal: @ 83718D4 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_BrendanMayNormal .4byte gMapObjectPicTable_BrendanNormal - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -32,7 +32,7 @@ gMapObjectGraphicsInfo_BrendanMachBike: @ 83718F8 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_BrendanMachBike - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -50,7 +50,7 @@ gMapObjectGraphicsInfo_BrendanAcroBike: @ 837191C .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_AcroBike .4byte gMapObjectPicTable_BrendanAcroBike - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -68,7 +68,7 @@ gMapObjectGraphicsInfo_BrendanSurfing: @ 8371940 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Surfing .4byte gMapObjectPicTable_BrendanSurfing - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -86,7 +86,7 @@ gMapObjectGraphicsInfo_BrendanFieldMove: @ 8371964 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_FieldMove .4byte gMapObjectPicTable_BrendanFieldMove - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -104,7 +104,7 @@ gMapObjectGraphicsInfo_QuintyPlump: @ 8371988 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_QuintyPlump .4byte gMapObjectPicTable_QuintyPlump - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -122,7 +122,7 @@ gMapObjectGraphicsInfo_LittleBoy1: @ 83719AC .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_LittleBoy1 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -140,7 +140,7 @@ gMapObjectGraphicsInfo_LittleGirl1: @ 83719D0 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_LittleGirl1 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -158,7 +158,7 @@ gMapObjectGraphicsInfo_Boy1: @ 83719F4 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Boy1 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -176,7 +176,7 @@ gMapObjectGraphicsInfo_Girl1: @ 8371A18 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Girl1 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -194,7 +194,7 @@ gMapObjectGraphicsInfo_Boy2: @ 8371A3C .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Boy2 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -212,7 +212,7 @@ gMapObjectGraphicsInfo_Girl2: @ 8371A60 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Girl2 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -230,7 +230,7 @@ gMapObjectGraphicsInfo_LittleBoy2: @ 8371A84 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_LittleBoy2 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -248,7 +248,7 @@ gMapObjectGraphicsInfo_LittleGirl2: @ 8371AA8 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_LittleGirl2 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -266,7 +266,7 @@ gMapObjectGraphicsInfo_Boy3: @ 8371ACC .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Boy3 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -284,7 +284,7 @@ gMapObjectGraphicsInfo_Girl3: @ 8371AF0 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Girl3 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -302,7 +302,7 @@ gMapObjectGraphicsInfo_Boy4: @ 8371B14 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Boy4 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -320,7 +320,7 @@ gMapObjectGraphicsInfo_Woman1: @ 8371B38 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Woman1 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -338,7 +338,7 @@ gMapObjectGraphicsInfo_FatMan: @ 8371B5C .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_FatMan - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -356,7 +356,7 @@ gMapObjectGraphicsInfo_Woman2: @ 8371B80 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Woman2 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -374,7 +374,7 @@ gMapObjectGraphicsInfo_Man1: @ 8371BA4 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Man1 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -392,7 +392,7 @@ gMapObjectGraphicsInfo_Woman3: @ 8371BC8 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Woman3 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -410,7 +410,7 @@ gMapObjectGraphicsInfo_OldMan1: @ 8371BEC .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_OldMan1 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -428,7 +428,7 @@ gMapObjectGraphicsInfo_OldWoman1: @ 8371C10 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_OldWoman1 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -446,7 +446,7 @@ gMapObjectGraphicsInfo_Man2: @ 8371C34 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Man2 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -464,7 +464,7 @@ gMapObjectGraphicsInfo_Woman4: @ 8371C58 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Woman4 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -482,7 +482,7 @@ gMapObjectGraphicsInfo_Man3: @ 8371C7C .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Man3 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -500,7 +500,7 @@ gMapObjectGraphicsInfo_Woman5: @ 8371CA0 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Woman5 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -518,7 +518,7 @@ gMapObjectGraphicsInfo_Cook: @ 8371CC4 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Cook - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -536,7 +536,7 @@ gMapObjectGraphicsInfo_Woman6: @ 8371CE8 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Woman6 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -554,7 +554,7 @@ gMapObjectGraphicsInfo_OldMan2: @ 8371D0C .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_OldMan2 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -572,7 +572,7 @@ gMapObjectGraphicsInfo_OldWoman2: @ 8371D30 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_OldWoman2 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -590,7 +590,7 @@ gMapObjectGraphicsInfo_Camper: @ 8371D54 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Camper - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -608,7 +608,7 @@ gMapObjectGraphicsInfo_Picnicker: @ 8371D78 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Picnicker - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -626,7 +626,7 @@ gMapObjectGraphicsInfo_Man4: @ 8371D9C .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Man4 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -644,7 +644,7 @@ gMapObjectGraphicsInfo_Woman7: @ 8371DC0 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Woman7 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -662,7 +662,7 @@ gMapObjectGraphicsInfo_Youngster: @ 8371DE4 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Youngster - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -680,7 +680,7 @@ gMapObjectGraphicsInfo_BugCatcher: @ 8371E08 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_BugCatcher - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -698,7 +698,7 @@ gMapObjectGraphicsInfo_PsychicM: @ 8371E2C .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_PsychicM - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -716,7 +716,7 @@ gMapObjectGraphicsInfo_SchoolKidM: @ 8371E50 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_SchoolKidM - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -734,7 +734,7 @@ gMapObjectGraphicsInfo_Maniac: @ 8371E74 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Maniac - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -752,7 +752,7 @@ gMapObjectGraphicsInfo_HexManiac: @ 8371E98 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_HexManiac - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -770,7 +770,7 @@ gMapObjectGraphicsInfo_Woman8: @ 8371EBC .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Woman8 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -788,7 +788,7 @@ gMapObjectGraphicsInfo_SwimmerM: @ 8371EE0 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_SwimmerM - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -806,7 +806,7 @@ gMapObjectGraphicsInfo_SwimmerF: @ 8371F04 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_SwimmerF - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -824,7 +824,7 @@ gMapObjectGraphicsInfo_BlackBelt: @ 8371F28 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_BlackBelt - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -842,7 +842,7 @@ gMapObjectGraphicsInfo_Beauty: @ 8371F4C .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Beauty - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -860,7 +860,7 @@ gMapObjectGraphicsInfo_Scientist1: @ 8371F70 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Scientist1 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -878,7 +878,7 @@ gMapObjectGraphicsInfo_Lass: @ 8371F94 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Lass - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -896,7 +896,7 @@ gMapObjectGraphicsInfo_Gentleman: @ 8371FB8 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Gentleman - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -914,7 +914,7 @@ gMapObjectGraphicsInfo_Sailor: @ 8371FDC .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Sailor - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -932,7 +932,7 @@ gMapObjectGraphicsInfo_Fisherman: @ 8372000 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Fisherman - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -950,7 +950,7 @@ gMapObjectGraphicsInfo_RunningTriathleteM: @ 8372024 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_RunningTriathleteM - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -968,7 +968,7 @@ gMapObjectGraphicsInfo_RunningTriathleteF: @ 8372048 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_RunningTriathleteF - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -986,7 +986,7 @@ gMapObjectGraphicsInfo_TuberF: @ 837206C .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_TuberF - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1004,7 +1004,7 @@ gMapObjectGraphicsInfo_TuberM: @ 8372090 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_TuberM - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1022,7 +1022,7 @@ gMapObjectGraphicsInfo_Hiker: @ 83720B4 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Hiker - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1040,7 +1040,7 @@ gMapObjectGraphicsInfo_CyclingTriathleteM: @ 83720D8 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_AcroBike .4byte gMapObjectPicTable_CyclingTriathleteM - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1058,7 +1058,7 @@ gMapObjectGraphicsInfo_CyclingTriathleteF: @ 83720FC .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_AcroBike .4byte gMapObjectPicTable_CyclingTriathleteF - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1076,7 +1076,7 @@ gMapObjectGraphicsInfo_Nurse: @ 8372120 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Nurse .4byte gMapObjectPicTable_Nurse - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1094,7 +1094,7 @@ gMapObjectGraphicsInfo_ItemBall: @ 8372144 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_ItemBall - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1112,7 +1112,7 @@ gMapObjectGraphicsInfo_BerryTree: @ 8372168 .4byte NULL @ OAM tables .4byte gMapObjectImageAnimTable_BerryTree .4byte gMapObjectPicTable_PechaBerryTree - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1130,7 +1130,7 @@ gMapObjectGraphicsInfo_BerryTreeEarlyStages: @ 837218C .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_BerryTree .4byte gMapObjectPicTable_PechaBerryTree - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1148,7 +1148,7 @@ gMapObjectGraphicsInfo_BerryTreeLateStages: @ 83721B0 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_BerryTree .4byte gMapObjectPicTable_PechaBerryTree - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1166,7 +1166,7 @@ gMapObjectGraphicsInfo_ProfBirch: @ 83721D4 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_ProfBirch - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1184,7 +1184,7 @@ gMapObjectGraphicsInfo_Man5: @ 83721F8 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Man5 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1202,7 +1202,7 @@ gMapObjectGraphicsInfo_Man6: @ 837221C .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Man6 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1220,7 +1220,7 @@ gMapObjectGraphicsInfo_ReporterM: @ 8372240 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_ReporterM - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1238,7 +1238,7 @@ gMapObjectGraphicsInfo_ReporterF: @ 8372264 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_ReporterF - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1256,7 +1256,7 @@ gMapObjectGraphicsInfo_Bard: @ 8372288 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MauvilleOldMan1 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1274,7 +1274,7 @@ gMapObjectGraphicsInfo_Hipster: @ 83722AC .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MauvilleOldMan1 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1292,7 +1292,7 @@ gMapObjectGraphicsInfo_Trader: @ 83722D0 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MauvilleOldMan1 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1310,7 +1310,7 @@ gMapObjectGraphicsInfo_Storyteller: @ 83722F4 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MauvilleOldMan2 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1328,7 +1328,7 @@ gMapObjectGraphicsInfo_Giddy: @ 8372318 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MauvilleOldMan2 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1346,7 +1346,7 @@ gMapObjectGraphicsInfo_UnusedMauvilleOldMan1: @ 837233C .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MauvilleOldMan2 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1364,7 +1364,7 @@ gMapObjectGraphicsInfo_UnusedMauvilleOldMan2: @ 8372360 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MauvilleOldMan2 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1382,7 +1382,7 @@ gMapObjectGraphicsInfo_UnusedNatuDoll: @ 8372384 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_UnusedNatuDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1400,7 +1400,7 @@ gMapObjectGraphicsInfo_UnusedMagnemiteDoll: @ 83723A8 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_UnusedMagnemiteDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1418,7 +1418,7 @@ gMapObjectGraphicsInfo_UnusedSquirtleDoll: @ 83723CC .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_UnusedSquirtleDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1436,7 +1436,7 @@ gMapObjectGraphicsInfo_UnusedWooperDoll: @ 83723F0 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_UnusedWooperDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1454,7 +1454,7 @@ gMapObjectGraphicsInfo_UnusedPikachuDoll: @ 8372414 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_UnusedPikachuDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1472,7 +1472,7 @@ gMapObjectGraphicsInfo_UnusedPorygon2Doll: @ 8372438 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_UnusedPorygon2Doll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1490,7 +1490,7 @@ gMapObjectGraphicsInfo_CuttableTree: @ 837245C .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_CuttableTree .4byte gMapObjectPicTable_CuttableTree - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1508,7 +1508,7 @@ gMapObjectGraphicsInfo_MartEmployee: @ 8372480 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MartEmployee - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1526,7 +1526,7 @@ gMapObjectGraphicsInfo_RooftopSaleWoman: @ 83724A4 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_RooftopSaleWoman - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1544,7 +1544,7 @@ gMapObjectGraphicsInfo_Teala: @ 83724C8 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Teala - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1562,7 +1562,7 @@ gMapObjectGraphicsInfo_BreakableRock: @ 83724EC .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_BreakableRock .4byte gMapObjectPicTable_BreakableRock - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1580,7 +1580,7 @@ gMapObjectGraphicsInfo_PushableBoulder: @ 8372510 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_PushableBoulder - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1598,7 +1598,7 @@ gMapObjectGraphicsInfo_MrBrineysBoat: @ 8372534 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MrBrineysBoat - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1616,7 +1616,7 @@ gMapObjectGraphicsInfo_MayNormal: @ 8372558 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_BrendanMayNormal .4byte gMapObjectPicTable_MayNormal - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1634,7 +1634,7 @@ gMapObjectGraphicsInfo_MayMachBike: @ 837257C .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MayMachBike - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1652,7 +1652,7 @@ gMapObjectGraphicsInfo_MayAcroBike: @ 83725A0 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_AcroBike .4byte gMapObjectPicTable_MayAcroBike - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1670,7 +1670,7 @@ gMapObjectGraphicsInfo_MaySurfing: @ 83725C4 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Surfing .4byte gMapObjectPicTable_MaySurfing - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1688,7 +1688,7 @@ gMapObjectGraphicsInfo_MayFieldMove: @ 83725E8 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_FieldMove .4byte gMapObjectPicTable_MayFieldMove - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1706,7 +1706,7 @@ gMapObjectGraphicsInfo_Truck: @ 837260C .4byte gMapObjectSubspriteTables_Truck .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_Truck - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1724,7 +1724,7 @@ gMapObjectGraphicsInfo_MachokeCarryingBox: @ 8372630 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MachokeCarryingBox - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1742,7 +1742,7 @@ gMapObjectGraphicsInfo_MachokeFacingAway: @ 8372654 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MachokeFacingAway - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1760,7 +1760,7 @@ gMapObjectGraphicsInfo_BirchsBag: @ 8372678 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_BirchsBag - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1778,7 +1778,7 @@ gMapObjectGraphicsInfo_Poochyena: @ 837269C .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Poochyena - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1796,7 +1796,7 @@ gMapObjectGraphicsInfo_Artist: @ 83726C0 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Artist - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1814,7 +1814,7 @@ gMapObjectGraphicsInfo_RivalBrendanNormal: @ 83726E4 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_BrendanMayNormal .4byte gMapObjectPicTable_BrendanNormal - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1832,7 +1832,7 @@ gMapObjectGraphicsInfo_RivalBrendanMachBike: @ 8372708 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_BrendanMachBike - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1850,7 +1850,7 @@ gMapObjectGraphicsInfo_RivalBrendanAcroBike: @ 837272C .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_AcroBike .4byte gMapObjectPicTable_BrendanAcroBike - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1868,7 +1868,7 @@ gMapObjectGraphicsInfo_RivalBrendanSurfing: @ 8372750 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Surfing .4byte gMapObjectPicTable_BrendanSurfing - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1886,7 +1886,7 @@ gMapObjectGraphicsInfo_RivalBrendanFieldMove: @ 8372774 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_FieldMove .4byte gMapObjectPicTable_BrendanFieldMove - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1904,7 +1904,7 @@ gMapObjectGraphicsInfo_RivalMayNormal: @ 8372798 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_BrendanMayNormal .4byte gMapObjectPicTable_MayNormal - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1922,7 +1922,7 @@ gMapObjectGraphicsInfo_RivalMayMachBike: @ 83727BC .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MayMachBike - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1940,7 +1940,7 @@ gMapObjectGraphicsInfo_RivalMayAcroBike: @ 83727E0 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_AcroBike .4byte gMapObjectPicTable_MayAcroBike - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1958,7 +1958,7 @@ gMapObjectGraphicsInfo_RivalMaySurfing: @ 8372804 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Surfing .4byte gMapObjectPicTable_MaySurfing - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1976,7 +1976,7 @@ gMapObjectGraphicsInfo_RivalMayFieldMove: @ 8372828 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_FieldMove .4byte gMapObjectPicTable_MayFieldMove - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -1994,7 +1994,7 @@ gMapObjectGraphicsInfo_Cameraman: @ 837284C .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Cameraman - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2012,7 +2012,7 @@ gMapObjectGraphicsInfo_BrendanUnderwater: @ 8372870 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_BrendanUnderwater - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2030,7 +2030,7 @@ gMapObjectGraphicsInfo_MayUnderwater: @ 8372894 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MayUnderwater - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2048,7 +2048,7 @@ gMapObjectGraphicsInfo_MovingBox: @ 83728B8 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_MovingBox - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2066,7 +2066,7 @@ gMapObjectGraphicsInfo_CableCar: @ 83728DC .4byte gMapObjectSubspriteTables_CableCar .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_CableCar - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2084,7 +2084,7 @@ gMapObjectGraphicsInfo_Scientist2: @ 8372900 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Scientist2 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2102,7 +2102,7 @@ gMapObjectGraphicsInfo_Man7: @ 8372924 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Man7 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2120,7 +2120,7 @@ gMapObjectGraphicsInfo_AquaMemberM: @ 8372948 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_AquaMemberM - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2138,7 +2138,7 @@ gMapObjectGraphicsInfo_AquaMemberF: @ 837296C .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_AquaMemberF - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2156,7 +2156,7 @@ gMapObjectGraphicsInfo_MagmaMemberM: @ 8372990 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MagmaMemberM - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2174,7 +2174,7 @@ gMapObjectGraphicsInfo_MagmaMemberF: @ 83729B4 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MagmaMemberF - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2192,7 +2192,7 @@ gMapObjectGraphicsInfo_Sidney: @ 83729D8 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Sidney - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2210,7 +2210,7 @@ gMapObjectGraphicsInfo_Phoebe: @ 83729FC .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Phoebe - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2228,7 +2228,7 @@ gMapObjectGraphicsInfo_Glacia: @ 8372A20 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Glacia - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2246,7 +2246,7 @@ gMapObjectGraphicsInfo_Drake: @ 8372A44 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Drake - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2264,7 +2264,7 @@ gMapObjectGraphicsInfo_Roxanne: @ 8372A68 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Roxanne - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2282,7 +2282,7 @@ gMapObjectGraphicsInfo_Brawly: @ 8372A8C .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Brawly - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2300,7 +2300,7 @@ gMapObjectGraphicsInfo_Wattson: @ 8372AB0 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Wattson - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2318,7 +2318,7 @@ gMapObjectGraphicsInfo_Flannery: @ 8372AD4 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Flannery - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2336,7 +2336,7 @@ gMapObjectGraphicsInfo_Norman: @ 8372AF8 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Norman - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2354,7 +2354,7 @@ gMapObjectGraphicsInfo_Winona: @ 8372B1C .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Winona - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2372,7 +2372,7 @@ gMapObjectGraphicsInfo_Liza: @ 8372B40 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Liza - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2390,7 +2390,7 @@ gMapObjectGraphicsInfo_Tate: @ 8372B64 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Tate - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2408,7 +2408,7 @@ gMapObjectGraphicsInfo_Wallace: @ 8372B88 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Wallace - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2426,7 +2426,7 @@ gMapObjectGraphicsInfo_Steven: @ 8372BAC .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Steven - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2444,7 +2444,7 @@ gMapObjectGraphicsInfo_Wally: @ 8372BD0 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Wally - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2462,7 +2462,7 @@ gMapObjectGraphicsInfo_LittleBoy3: @ 8372BF4 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_LittleBoy3 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2480,7 +2480,7 @@ gMapObjectGraphicsInfo_BrendanFishing: @ 8372C18 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Fishing .4byte gMapObjectPicTable_BrendanFishing - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2498,7 +2498,7 @@ gMapObjectGraphicsInfo_MayFishing: @ 8372C3C .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Fishing .4byte gMapObjectPicTable_MayFishing - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2516,7 +2516,7 @@ gMapObjectGraphicsInfo_HotSpringsOldWoman: @ 8372C60 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_HotSpringsOldWoman - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2534,7 +2534,7 @@ gMapObjectGraphicsInfo_SSTidal: @ 8372C84 .4byte gMapObjectSubspriteTables_SSTidal .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_SSTidal - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2552,7 +2552,7 @@ gMapObjectGraphicsInfo_SubmarineShadow: @ 8372CA8 .4byte gMapObjectSubspriteTables_SubmarineShadow .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_SubmarineShadow - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2570,7 +2570,7 @@ gMapObjectGraphicsInfo_PichuDoll: @ 8372CCC .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_PichuDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2588,7 +2588,7 @@ gMapObjectGraphicsInfo_PikachuDoll: @ 8372CF0 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_PikachuDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2606,7 +2606,7 @@ gMapObjectGraphicsInfo_MarillDoll: @ 8372D14 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_MarillDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2624,7 +2624,7 @@ gMapObjectGraphicsInfo_TogepiDoll: @ 8372D38 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_TogepiDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2642,7 +2642,7 @@ gMapObjectGraphicsInfo_CyndaquilDoll: @ 8372D5C .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_CyndaquilDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2660,7 +2660,7 @@ gMapObjectGraphicsInfo_ChikoritaDoll: @ 8372D80 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_ChikoritaDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2678,7 +2678,7 @@ gMapObjectGraphicsInfo_TotodileDoll: @ 8372DA4 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_TotodileDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2696,7 +2696,7 @@ gMapObjectGraphicsInfo_JigglypuffDoll: @ 8372DC8 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_JigglypuffDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2714,7 +2714,7 @@ gMapObjectGraphicsInfo_MeowthDoll: @ 8372DEC .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_MeowthDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2732,7 +2732,7 @@ gMapObjectGraphicsInfo_ClefairyDoll: @ 8372E10 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_ClefairyDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2750,7 +2750,7 @@ gMapObjectGraphicsInfo_DittoDoll: @ 8372E34 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_DittoDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2768,7 +2768,7 @@ gMapObjectGraphicsInfo_SmoochumDoll: @ 8372E58 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_SmoochumDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2786,7 +2786,7 @@ gMapObjectGraphicsInfo_TreeckoDoll: @ 8372E7C .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_TreeckoDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2804,7 +2804,7 @@ gMapObjectGraphicsInfo_TorchicDoll: @ 8372EA0 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_TorchicDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2822,7 +2822,7 @@ gMapObjectGraphicsInfo_MudkipDoll: @ 8372EC4 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_MudkipDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2840,7 +2840,7 @@ gMapObjectGraphicsInfo_DuskullDoll: @ 8372EE8 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_DuskullDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2858,7 +2858,7 @@ gMapObjectGraphicsInfo_WynautDoll: @ 8372F0C .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_WynautDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2876,7 +2876,7 @@ gMapObjectGraphicsInfo_BaltoyDoll: @ 8372F30 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_BaltoyDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2894,7 +2894,7 @@ gMapObjectGraphicsInfo_KecleonDoll: @ 8372F54 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_KecleonDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2912,7 +2912,7 @@ gMapObjectGraphicsInfo_AzurillDoll: @ 8372F78 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_AzurillDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2930,7 +2930,7 @@ gMapObjectGraphicsInfo_SkittyDoll: @ 8372F9C .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_SkittyDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2948,7 +2948,7 @@ gMapObjectGraphicsInfo_SwabluDoll: @ 8372FC0 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_SwabluDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2966,7 +2966,7 @@ gMapObjectGraphicsInfo_GulpinDoll: @ 8372FE4 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_GulpinDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -2984,7 +2984,7 @@ gMapObjectGraphicsInfo_LotadDoll: @ 8373008 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_LotadDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3002,7 +3002,7 @@ gMapObjectGraphicsInfo_SeedotDoll: @ 837302C .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_SeedotDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3020,7 +3020,7 @@ gMapObjectGraphicsInfo_PikaCushion: @ 8373050 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_PikaCushion - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3038,7 +3038,7 @@ gMapObjectGraphicsInfo_RoundCushion: @ 8373074 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_RoundCushion - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3056,7 +3056,7 @@ gMapObjectGraphicsInfo_KissCushion: @ 8373098 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_KissCushion - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3074,7 +3074,7 @@ gMapObjectGraphicsInfo_ZigzagCushion: @ 83730BC .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_ZigzagCushion - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3092,7 +3092,7 @@ gMapObjectGraphicsInfo_SpinCushion: @ 83730E0 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_SpinCushion - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3110,7 +3110,7 @@ gMapObjectGraphicsInfo_DiamondCushion: @ 8373104 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_DiamondCushion - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3128,7 +3128,7 @@ gMapObjectGraphicsInfo_BallCushion: @ 8373128 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_BallCushion - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3146,7 +3146,7 @@ gMapObjectGraphicsInfo_GrassCushion: @ 837314C .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_GrassCushion - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3164,7 +3164,7 @@ gMapObjectGraphicsInfo_FireCushion: @ 8373170 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_FireCushion - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3182,7 +3182,7 @@ gMapObjectGraphicsInfo_WaterCushion: @ 8373194 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_WaterCushion - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3200,7 +3200,7 @@ gMapObjectGraphicsInfo_BigSnorlaxDoll: @ 83731B8 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_BigSnorlaxDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3218,7 +3218,7 @@ gMapObjectGraphicsInfo_BigRhydonDoll: @ 83731DC .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_BigRhydonDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3236,7 +3236,7 @@ gMapObjectGraphicsInfo_BigLaprasDoll: @ 8373200 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_BigLaprasDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3254,7 +3254,7 @@ gMapObjectGraphicsInfo_BigVenusaurDoll: @ 8373224 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_BigVenusaurDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3272,7 +3272,7 @@ gMapObjectGraphicsInfo_BigCharizardDoll: @ 8373248 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_BigCharizardDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3290,7 +3290,7 @@ gMapObjectGraphicsInfo_BigBlastoiseDoll: @ 837326C .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_BigBlastoiseDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3308,7 +3308,7 @@ gMapObjectGraphicsInfo_BigWailmerDoll: @ 8373290 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_BigWailmerDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3326,7 +3326,7 @@ gMapObjectGraphicsInfo_BigRegirockDoll: @ 83732B4 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_BigRegirockDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3344,7 +3344,7 @@ gMapObjectGraphicsInfo_BigRegiceDoll: @ 83732D8 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_BigRegiceDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3362,7 +3362,7 @@ gMapObjectGraphicsInfo_BigRegisteelDoll: @ 83732FC .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_BigRegisteelDoll - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3380,7 +3380,7 @@ gMapObjectGraphicsInfo_Latias: @ 8373320 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_LatiasLatios - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3398,7 +3398,7 @@ gMapObjectGraphicsInfo_Latios: @ 8373344 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_LatiasLatios - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3416,7 +3416,7 @@ gMapObjectGraphicsInfo_Boy5: @ 8373368 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Boy5 - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3434,7 +3434,7 @@ gMapObjectGraphicsInfo_ContestJudge: @ 837338C .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_ContestJudge - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3452,7 +3452,7 @@ gMapObjectGraphicsInfo_BrendanWatering: @ 83733B0 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_BrendanWatering - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3470,7 +3470,7 @@ gMapObjectGraphicsInfo_MayWatering: @ 83733D4 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_MayWatering - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3488,7 +3488,7 @@ gMapObjectGraphicsInfo_BrendanDecorating: @ 83733F8 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_BrendanDecorating - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3506,7 +3506,7 @@ gMapObjectGraphicsInfo_MayDecorating: @ 837341C .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_MayDecorating - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3524,7 +3524,7 @@ gMapObjectGraphicsInfo_Archie: @ 8373440 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Archie - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3542,7 +3542,7 @@ gMapObjectGraphicsInfo_Maxie: @ 8373464 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Maxie - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3596,7 +3596,7 @@ gMapObjectGraphicsInfo_Fossil: @ 83734D0 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Inanimate .4byte gMapObjectPicTable_Fossil - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3614,7 +3614,7 @@ gMapObjectGraphicsInfo_Regirock: @ 83734F4 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Regi - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3632,7 +3632,7 @@ gMapObjectGraphicsInfo_Regice: @ 8373518 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Regi - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3650,7 +3650,7 @@ gMapObjectGraphicsInfo_Registeel: @ 837353C .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Regi - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3668,7 +3668,7 @@ gMapObjectGraphicsInfo_Skitty: @ 8373560 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Skitty - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3686,7 +3686,7 @@ gMapObjectGraphicsInfo_Kecleon1: @ 8373584 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Kecleon - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3740,7 +3740,7 @@ gMapObjectGraphicsInfo_Rayquaza: @ 83735F0 .4byte gMapObjectSubspriteTables_32x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Rayquaza - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3758,7 +3758,7 @@ gMapObjectGraphicsInfo_Zigzagoon: @ 8373614 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Zigzagoon - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3776,7 +3776,7 @@ gMapObjectGraphicsInfo_Pikachu: @ 8373638 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Pikachu - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3794,7 +3794,7 @@ gMapObjectGraphicsInfo_Azumarill: @ 837365C .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Azumarill - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3812,7 +3812,7 @@ gMapObjectGraphicsInfo_Wingull: @ 8373680 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Wingull - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3830,7 +3830,7 @@ gMapObjectGraphicsInfo_Kecleon2: @ 83736A4 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Kecleon - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3848,7 +3848,7 @@ gMapObjectGraphicsInfo_TuberMSwimming: @ 83736C8 .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_TuberMSwimming - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3866,7 +3866,7 @@ gMapObjectGraphicsInfo_Azurill: @ 83736EC .4byte gMapObjectSubspriteTables_16x16 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Azurill - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3884,7 +3884,7 @@ gMapObjectGraphicsInfo_Mom: @ 8373710 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard .4byte gMapObjectPicTable_Mom - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3902,7 +3902,7 @@ gMapObjectGraphicsInfo_LinkBrendan: @ 8373734 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_BrendanMayNormal .4byte gMapObjectPicTable_BrendanNormal - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable .align 2 @@ -3920,4 +3920,4 @@ gMapObjectGraphicsInfo_LinkMay: @ 8373758 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_BrendanMayNormal .4byte gMapObjectPicTable_MayNormal - .4byte gDummyObjectRotScalAnimTable + .4byte gDummySpriteAffineAnimTable diff --git a/include/gba/defines.h b/include/gba/defines.h new file mode 100644 index 000000000..005efb079 --- /dev/null +++ b/include/gba/defines.h @@ -0,0 +1,49 @@ +#ifndef GUARD_GBA_DEFINES +#define GUARD_GBA_DEFINES + +#include <stddef.h> + +#define TRUE 1 +#define FALSE 0 + +#define IWRAM_DATA __attribute__((section("iwram_data"))) +#define EWRAM_DATA __attribute__((section("ewram_data"))) + +#define ALIGNED(n) __attribute__((aligned(n))) + +// The original build process placed COMMON data (i.e. uninitialized globals) +// in IWRAM after the static variables. +// When ld places COMMON variables in the output, it aligns the variable +// according to the size of the variable, with a maximum alignment of 16. This +// results in large alignment values. +// Initialized variables are aligned according to the size of the largest +// primitive type in the object, so their alignment will often be smaller. +// However, we cannot use COMMON data in pokeruby because the order of COMMON +// data in the output is not reliable. Instead, we need to initialize the +// variables so that their order in the source file is preserved in the output. +// But using initialized variables brings us into conflict with those large +// alignment values. +// These macros allow us to get around this by manually specifying what the +// alignment would be if the variable were uninitialized. +#define COMM(decl, n) IWRAM_DATA ALIGNED(1 << n) decl = {0}; +#define COMM_2(decl) COMM(decl, 2) +#define COMM_4(decl) COMM(decl, 4) + +#define SOUND_INFO_PTR (*(struct SoundInfo **)0x3007FF0) +#define INTR_CHECK (*(u16 *)0x3007FF8) +#define INTR_VECTOR (*(void **)0x3007FFC) + +#define OBJ_VRAM0 0x6010000 // when BG is in tilemap mode +#define OBJ_VRAM1 0x6014000 // when BG is in bitmap mode + +#define OAM 0x7000000 + +#define DISPLAY_WIDTH 240 +#define DISPLAY_HEIGHT 160 + +#define TILE_SIZE_4BPP 32 +#define TILE_SIZE_8BPP 64 + +#define TOTAL_OBJ_TILE_COUNT 1024 + +#endif // GUARD_GBA_DEFINES diff --git a/include/gba/gba.h b/include/gba/gba.h index 06067dacf..26342cf88 100644 --- a/include/gba/gba.h +++ b/include/gba/gba.h @@ -1,63 +1,10 @@ #ifndef GUARD_GBA_GBA_H #define GUARD_GBA_GBA_H -#include <stddef.h> - -typedef unsigned char u8; -typedef unsigned short u16; -typedef unsigned int u32; -typedef signed char s8; -typedef signed short s16; -typedef signed int s32; - -typedef volatile u8 vu8; -typedef volatile u16 vu16; -typedef volatile u32 vu32; -typedef volatile s8 vs8; -typedef volatile s16 vs16; -typedef volatile s32 vs32; - -typedef float f32; -typedef double f64; - -typedef u8 bool8; -typedef u16 bool16; -typedef u32 bool32; - -#define TRUE 1 -#define FALSE 0 - -#define IWRAM_DATA __attribute__((section("iwram_data"))) -#define EWRAM_DATA __attribute__((section("ewram_data"))) - -#define ALIGNED(n) __attribute__((aligned(n))) - -// The original build process placed COMMON data (i.e. uninitialized globals) -// in IWRAM after the static variables. -// When ld places COMMON variables in the output, it aligns the variable -// according to the size of the variable, with a maximum alignment of 16. This -// results in large alignment values. -// Initialized variables are aligned according to the size of the largest -// primitive type in the object, so their alignment will often be smaller. -// However, we cannot use COMMON data in pokeruby because the order of COMMON -// data in the output is not reliable. Instead, we need to initialize the -// variables so that their order in the source file is preserved in the output. -// But using initialized variables brings us into conflict with those large -// alignment values. -// These macros allow us to get around this by manually specifying what the -// alignment would be if the variable were uninitialized. -#define COMM(decl, n) IWRAM_DATA ALIGNED(1 << n) decl = {0}; -#define COMM_0(decl) COMM(decl, 0) -#define COMM_1(decl) COMM(decl, 1) -#define COMM_2(decl) COMM(decl, 2) -#define COMM_4(decl) COMM(decl, 4) - +#include "gba/defines.h" #include "gba/io_reg.h" +#include "gba/types.h" #include "gba/syscall.h" #include "gba/macro.h" -#define SOUND_INFO_PTR (*(struct SoundInfo **)0x3007FF0) -#define INTR_CHECK (*(u16 *)0x3007FF8) -#define INTR_VECTOR (*(void **)0x3007FFC) - #endif // GUARD_GBA_GBA_H diff --git a/include/gba/syscall.h b/include/gba/syscall.h index 9b2b81311..8ef82c0e4 100644 --- a/include/gba/syscall.h +++ b/include/gba/syscall.h @@ -15,12 +15,14 @@ void SoftReset(u32 resetFlags); void RegisterRamReset(u32 resetFlags); +void VBlankIntrWait(void); + #define CPU_SET_SRC_FIXED 0x01000000 #define CPU_SET_16BIT 0x00000000 #define CPU_SET_32BIT 0x04000000 void CpuSet(void *src, void *dest, u32 control); -void VBlankIntrWait(void); +void ObjAffineSet(struct ObjAffineSrcData *src, void *dest, s32 count, s32 offset); #endif // GUARD_GBA_SYSCALL_H diff --git a/include/gba/types.h b/include/gba/types.h new file mode 100644 index 000000000..4e1ab3003 --- /dev/null +++ b/include/gba/types.h @@ -0,0 +1,70 @@ +#ifndef GUARD_GBA_TYPES_H +#define GUARD_GBA_TYPES_H + +typedef unsigned char u8; +typedef unsigned short u16; +typedef unsigned int u32; +typedef signed char s8; +typedef signed short s16; +typedef signed int s32; + +typedef volatile u8 vu8; +typedef volatile u16 vu16; +typedef volatile u32 vu32; +typedef volatile s8 vs8; +typedef volatile s16 vs16; +typedef volatile s32 vs32; + +typedef float f32; +typedef double f64; + +typedef u8 bool8; +typedef u16 bool16; +typedef u32 bool32; + +struct OamData +{ + u32 y:8; + u32 affineMode:2; + u32 objMode:2; + u32 mosaic:1; + u32 bpp:1; + u32 shape:2; + + u32 x:9; + u32 matrixNum:5; // bits 3/4 are h-flip/v-flip if not in affine mode + u32 size:2; + + u16 tileNum:10; + u16 priority:2; + u16 paletteNum:4; + u16 affineParam; +}; + +#define ST_OAM_OBJ_NORMAL 0 +#define ST_OAM_OBJ_BLEND 1 +#define ST_OAM_OBJ_WINDOW 2 + +#define ST_OAM_AFFINE_OFF 0 +#define ST_OAM_AFFINE_NORMAL 1 +#define ST_OAM_AFFINE_ERASE 2 +#define ST_OAM_AFFINE_DOUBLE 3 + +#define ST_OAM_AFFINE_ON_MASK 1 +#define ST_OAM_AFFINE_DOUBLE_MASK 2 + +#define ST_OAM_4BPP 0 +#define ST_OAM_8BPP 1 + +#define ST_OAM_SQUARE 0 +#define ST_OAM_H_RECTANGLE 1 +#define ST_OAM_V_RECTANGLE 2 + +struct ObjAffineSrcData +{ + s16 xScale; + s16 yScale; + u16 rotation; +}; + +#endif // GUARD_GBA_TYPES_H diff --git a/include/global.h b/include/global.h index 79c9e771f..b4a88ef5f 100644 --- a/include/global.h +++ b/include/global.h @@ -17,6 +17,12 @@ enum FEMALE }; +struct Coords16 +{ + s16 x; + s16 y; +}; + struct Time { s16 days; diff --git a/include/main.h b/include/main.h new file mode 100644 index 000000000..06480af43 --- /dev/null +++ b/include/main.h @@ -0,0 +1,45 @@ +#ifndef GUARD_MAIN_H +#define GUARD_MAIN_H + +#include "global.h" + +typedef void (*MainCallback)(void); +typedef void (*IntrCallback)(void); +typedef void (*IntrFunc)(void); + +struct Main +{ + MainCallback callback1; + MainCallback callback2; + + u32 field_8; + + IntrCallback vblankCallback; + IntrCallback hblankCallback; + IntrCallback vcountCallback; + IntrCallback serialCallback; + + vu16 intrCheck; + + u32 vblankCounter1; + u32 vblankCounter2; + + u16 heldKeysRaw; // held keys without L=A remapping + u16 newKeysRaw; // newly pressed keys without L=A remapping + u16 heldKeys; // held keys with L=A remapping + u16 newKeys; // newly pressed keys with L=A remapping + u16 newAndRepeatedKeys; // newly pressed keys plus key repeat + u16 keyRepeatCounter; // counts down to 0, triggering key repeat + bool16 watchedKeysPressed; // whether one of the watched keys was pressed + u16 watchedKeysMask; // bit mask for watched keys + + u8 objCount; + + struct OamData oamBuffer[128]; + + u8 state; + + u8 oamLoadDisabled:1; +}; + +#endif // GUARD_MAIN_H diff --git a/include/sprite.h b/include/sprite.h new file mode 100644 index 000000000..27b3222ee --- /dev/null +++ b/include/sprite.h @@ -0,0 +1,242 @@ +#ifndef GUARD_SPRITE_H +#define GUARD_SPRITE_H + +struct SpriteSheet +{ + u8 *data; + u16 size; + u16 tag; +}; + +struct SpriteFrameImage +{ + u8 *data; + u16 size; +}; + +struct SpritePalette +{ + u8 *data; + u16 tag; +}; + +struct AnimFrameCmd +{ + // If the sprite has an array of images, this is the array index. + // If the sprite has a sheet, this is the tile offset. + u32 imageValue:16; + + u32 duration:6; + u32 hFlip:1; + u32 vFlip:1; +}; + +struct AnimLoopCmd +{ + u32 type:16; + u32 count:6; +}; + +struct AnimJumpCmd +{ + u32 type:16; + u32 target:6; +}; + +union AnimCmd +{ + s16 type; + struct AnimFrameCmd frame; + struct AnimLoopCmd loop; + struct AnimJumpCmd jump; +}; + +struct AffineAnimFrameCmd +{ + s16 xScale; + s16 yScale; + u8 rotation; + u8 duration; +}; + +struct AffineAnimLoopCmd +{ + s16 type; + u16 count; +}; + +struct AffineAnimJumpCmd +{ + s16 type; + u16 target; +}; + +union AffineAnimCmd +{ + s16 type; + struct AffineAnimFrameCmd frame; + struct AffineAnimLoopCmd loop; + struct AffineAnimJumpCmd jump; +}; + +struct AffineAnimState +{ + u8 animNum; + u8 animCmdIndex; + u8 delayCounter; + u8 loopCounter; + s16 xScale; + s16 yScale; + u16 rotation; +}; + +enum +{ + SUBSPRITES_OFF, + SUBSPRITES_ON, + SUBSPRITES_IGNORE_PRIORITY, // on but priority is ignored +}; + +struct Subsprite +{ + u16 x; + u16 y; + u16 shape:2; + u16 size:2; + u16 tileOffset:10; + u16 priority:2; +}; + +struct SubspriteTable +{ + u8 subspriteCount; + struct Subsprite *subsprites; +}; + +struct Sprite; + +struct SpriteTemplate +{ + u16 tileTag; + u16 paletteTag; + struct OamData *oam; + union AnimCmd **anims; + struct SpriteFrameImage *images; + union AffineAnimCmd **affineAnims; + void (*callback)(struct Sprite *); +}; + +struct Sprite +{ + struct OamData oam; + union AnimCmd **anims; + struct SpriteFrameImage *images; + union AffineAnimCmd **affineAnims; + struct SpriteTemplate *template; + struct SubspriteTable *subspriteTables; + void (*callback)(struct Sprite *); + + struct Coords16 pos1; + struct Coords16 pos2; + s8 centerToCornerVecX; + s8 centerToCornerVecY; + + u8 animNum; + u8 animCmdIndex; + u8 animDelayCounter:6; + u8 animPaused:1; + u8 affineAnimPaused:1; + u8 animLoopCounter; + + // general purpose data fields + u16 data0; + u16 data1; + u16 data2; + u16 data3; + u16 data4; + u16 data5; + u16 data6; + u16 data7; + + u16 inUse:1; + u16 coordOffsetEnabled:1; + u16 invisible:1; + u16 flags_3:1; + u16 flags_4:1; + u16 flags_5:1; + u16 flags_6:1; + u16 flags_7:1; + u16 hFlip:1; + u16 vFlip:1; + u16 animBeginning:1; + u16 affineAnimBeginning:1; + u16 animEnded:1; + u16 affineAnimEnded:1; + u16 usingSheet:1; + u16 flags_f:1; + + u16 sheetTileStart; + + u8 subspriteTableNum:6; + u8 subspriteMode:2; + + u8 subpriority; +}; + +void ResetSpriteData(void); +void AnimateSprites(void); +void BuildOamBuffer(void); +u8 CreateSprite(struct SpriteTemplate *template, u16 x, u16 y, u8 subpriority); +u8 CreateSpriteAtEnd(struct SpriteTemplate *template, u16 x, u16 y, u8 subpriority); +u8 CreateInvisibleSprite(void (*callback)(struct Sprite *)); +u8 CreateSpriteAndAnimate(struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority); +void DestroySprite(struct Sprite *sprite); +void ResetOamRange(u8 a, u8 b); +void LoadOam(void); +void SetOamMatrix(u8 matrixNum, u16 a, u16 b, u16 c, u16 d); +void CalcCenterToCornerVec(struct Sprite *sprite, u8 shape, u8 size, u8 affineMode); +void SpriteCallbackDummy(struct Sprite *sprite); +void ProcessSpriteCopyRequests(void); +void RequestSpriteCopy(u8 *src, u8 *dest, u16 size); +void FreeSpriteTiles(struct Sprite *sprite); +void FreeSpritePalette(struct Sprite *sprite); +void FreeSpriteOamMatrix(struct Sprite *sprite); +void DestroySpriteAndFreeResources(struct Sprite *sprite); +void sub_800142C(u32 a1, u32 a2, u16 *a3, u16 a4, u32 a5); +void AnimateSprite(struct Sprite *sprite); +void StartSpriteAnim(struct Sprite *sprite, u8 animNum); +void StartSpriteAnimIfDifferent(struct Sprite *sprite, u8 animNum); +void SeekSpriteAnim(struct Sprite *sprite, u8 animCmdIndex); +void StartSpriteAffineAnim(struct Sprite *sprite, u8 animNum); +void StartSpriteAffineAnimIfDifferent(struct Sprite *sprite, u8 animNum); +void ChangeSpriteAffineAnim(struct Sprite *sprite, u8 animNum); +void ChangeSpriteAffineAnimIfDifferent(struct Sprite *sprite, u8 animNum); +void SetSpriteSheetFrameTileNum(struct Sprite *sprite); +u8 AllocOamMatrix(void); +void FreeOamMatrix(u8 matrixNum); +void InitSpriteAffineAnim(struct Sprite *sprite); +void SetOamMatrixRotationScaling(u8 matrixNum, s16 xScale, s16 yScale, u16 rotation); +u16 LoadSpriteSheet(struct SpriteSheet *sheet); +void LoadSpriteSheets(struct SpriteSheet *sheets); +u16 AllocTilesForSpriteSheet(struct SpriteSheet *sheet); +void AllocTilesForSpriteSheets(struct SpriteSheet *sheets); +void LoadTilesForSpriteSheet(struct SpriteSheet *sheet); +void LoadTilesForSpriteSheets(struct SpriteSheet *sheets); +void FreeSpriteTilesByTag(u16 tag); +void FreeAllSpriteTiles(void); +u16 GetSpriteTileStartByTag(u16 tag); +u16 GetSpriteTileTagByTileStart(u16 start); +void RequestSpriteSheetCopy(struct SpriteSheet *sheet); +u16 LoadSpriteSheetDeferred(struct SpriteSheet *sheet); +void FreeAllSpritePalettes(void); +u8 LoadSpritePalette(struct SpritePalette *palette); +void LoadSpritePalettes(struct SpritePalette *palettes); +u8 AllocSpritePalette(u16 tag); +u8 IndexOfSpritePaletteTag(u16 tag); +u16 GetSpritePaletteTagByPaletteNum(u8 paletteNum); +void FreeSpritePaletteByTag(u16 tag); +void SetSubspriteTables(struct Sprite *sprite, struct SubspriteTable *subspriteTables); +bool8 AddSpriteToOamBuffer(struct Sprite *object, u8 *oamIndex); +bool8 AddSubspritesToOamBuffer(struct Sprite *sprite, struct OamData *destOam, u8 *oamIndex); + +#endif // GUARD_SPRITE_H diff --git a/ld_script.txt b/ld_script.txt index 0c3029cae..a1341c13f 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -10,6 +10,7 @@ SECTIONS { ALIGN(4) { src/main.o(ewram_data); + src/sprite.o(ewram_data); } . = 0x3000000; @@ -17,6 +18,7 @@ SECTIONS { iwram (NOLOAD) : ALIGN(4) { + src/sprite.o(.bss); . = 0xF28; src/agb_flash.o(.bss); . = 0xF36; @@ -25,6 +27,7 @@ SECTIONS { tools/agbcc/lib/libgcc.a:fp-bit.o(.bss); src/m4a_2.o(.bss.code); src/main.o(iwram_data); + src/sprite.o(iwram_data); . = 0x5FD0; src/m4a_2.o(iwram_data); } @@ -36,6 +39,7 @@ SECTIONS { { asm/crt0.o(.text); src/main.o(.text); + src/sprite.o(.text); asm/rom1.o(.text); src/string_util.o(.text); asm/rom2.o(.text); @@ -87,6 +91,8 @@ SECTIONS { ALIGN(4) { src/main.o(.rodata); + src/sprite.o(.rodata); + . += 0x8; /* Why the gap? */ data/data2.o(.rodata); src/m4a_tables.o(.rodata); data/sound_data.o(.rodata); diff --git a/src/main.c b/src/main.c index 9e029eeb2..0c5055e60 100644 --- a/src/main.c +++ b/src/main.c @@ -3,50 +3,7 @@ #include "gba/flash_internal.h" #include "siirtc.h" #include "rtc.h" - -typedef void (*MainCallback)(void); -typedef void (*IntrCallback)(void); -typedef void (*IntrFunc)(void); - -struct OamData -{ - u32 a, b; -}; - -struct Main -{ - MainCallback callback1; - MainCallback callback2; - - u32 field_8; - - IntrCallback vblankCallback; - IntrCallback hblankCallback; - IntrCallback vcountCallback; - IntrCallback serialCallback; - - vu16 intrCheck; - - u32 vblankCounter1; - u32 vblankCounter2; - - u16 heldKeysRaw; // held keys without L=A remapping - u16 newKeysRaw; // newly pressed keys without L=A remapping - u16 heldKeys; // held keys with L=A remapping - u16 newKeys; // newly pressed keys with L=A remapping - u16 newAndRepeatedKeys; // newly pressed keys plus key repeat - u16 keyRepeatCounter; // counts down to 0, triggering key repeat - bool16 watchedKeysPressed; // whether one of the watched keys was pressed - u16 watchedKeysMask; // bit mask for watched keys - - u32 field_38; - - struct OamData oamBuffer[128]; - - u8 state; - - bool8 oamLoadDisabled; -}; +#include "main.h" extern struct SoundInfo gSoundInfo; extern u16 gUnknown_3002A20; diff --git a/src/sprite.c b/src/sprite.c new file mode 100644 index 000000000..1a586a63d --- /dev/null +++ b/src/sprite.c @@ -0,0 +1,1795 @@ +#include "global.h" +#include "main.h" +#include "sprite.h" + +#define MAX_SPRITES 64 + +#define MAX_SPRITE_COPY_REQUESTS 64 + +#define OAM_MATRIX_COUNT 32 + +#define SET_SPRITE_TILE_RANGE(index, start, count) \ +{ \ + u16 *rangeStarts; \ + u16 *rangeCounts; \ + rangeStarts = sSpriteTileRanges; \ + rangeStarts[index * 2] = start; \ + rangeCounts = sSpriteTileRanges + 1; \ + rangeCounts[index * 2] = count; \ +} + +struct OamMatrix +{ + s16 a; + s16 b; + s16 c; + s16 d; +}; + +struct SpriteCopyRequest +{ + u8 *src; + u8 *dest; + u16 size; +}; + +struct OamDimensions +{ + s8 width; + s8 height; +}; + +void gpu_pal_apply(u8 *, u16, u32); +void sub_814A590(void); + +static void UpdateOamCoords(void); +static void BuildSpritePriorities(void); +static void SortSprites(void); +static void CopyMatricesToOamBuffer(void); +static void AddSpritesToOamBuffer(void); +static u8 CreateSpriteAt(u8 index, struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority); +static void ClearSpriteCopyRequests(void); +static void ResetOamMatrices(void); +static void ResetSprite(struct Sprite *sprite); +static s16 AllocSpriteTiles(u16 tileCount); +static u8 SpriteTileAllocBitmapOp(u16 bit, u8 op); +static void RequestSpriteFrameImageCopy(u16 index, u16 tileNum, struct SpriteFrameImage *images); +static void CopyFromSprites(u8 *dest); +static void CopyToSprites(u8 *src); +static void ResetAllSprites(void); +static void BeginAnim(struct Sprite *sprite); +static void ContinueAnim(struct Sprite *sprite); +static void AnimCmd_frame(struct Sprite *sprite); +static void AnimCmd_end(struct Sprite *sprite); +static void AnimCmd_jump(struct Sprite *sprite); +static void AnimCmd_loop(struct Sprite *sprite); +static void BeginAnimLoop(struct Sprite *sprite); +static void ContinueAnimLoop(struct Sprite *sprite); +static void JumpToTopOfAnimLoop(struct Sprite *sprite); +static void BeginAffineAnim(struct Sprite *sprite); +static void ContinueAffineAnim(struct Sprite *sprite); +static void AffineAnimDelay(u8 matrixNum, struct Sprite *sprite); +static void AffineAnimCmd_loop(u8 matrixNum, struct Sprite *sprite); +static void BeginAffineAnimLoop(u8 matrixNum, struct Sprite *sprite); +static void ContinueAffineAnimLoop(u8 matrixNum, struct Sprite *sprite); +static void JumpToTopOfAffineAnimLoop(u8 matrixNum, struct Sprite *sprite); +static void AffineAnimCmd_jump(u8 matrixNum, struct Sprite *sprite); +static void AffineAnimCmd_end(u8 matrixNum, struct Sprite *sprite); +static void AffineAnimCmd_frame(u8 matrixNum, struct Sprite *sprite); +static void CopyOamMatrix(u8 destMatrixIndex, struct OamMatrix *srcMatrix); +static u8 GetSpriteMatrixNum(struct Sprite *sprite); +static void SetSpriteOamFlipBits(struct Sprite *sprite, u8 hFlip, u8 vFlip); +static void AffineAnimStateRestartAnim(u8 matrixNum); +static void AffineAnimStateStartAnim(u8 matrixNum, u8 animNum); +static void AffineAnimStateReset(u8 matrixNum); +static void ApplyAffineAnimFrameAbsolute(u8 matrixNum, struct AffineAnimFrameCmd *frameCmd); +static void DecrementAnimDelayCounter(struct Sprite *sprite); +static bool8 DecrementAffineAnimDelayCounter(struct Sprite *sprite, u8 matrixNum); +static void ApplyAffineAnimFrameRelativeAndUpdateMatrix(u8 matrixNum, struct AffineAnimFrameCmd *frameCmd); +static s16 ConvertScaleParam(s16 scale); +static void GetAffineAnimFrame(u8 matrixNum, struct Sprite *sprite, struct AffineAnimFrameCmd *frameCmd); +static void ApplyAffineAnimFrame(u8 matrixNum, struct AffineAnimFrameCmd *frameCmd); +static void ResetAffineAnimData(void); +static u8 IndexOfSpriteTileTag(u16 tag); +static void AddSpriteTileRange(u16 tag, u16 start, u16 count); +static void ApplySpritePalette(u8 *src, u16 paletteOffset); + +typedef void (*AnimFunc)(struct Sprite *); +typedef void (*AnimCmdFunc)(struct Sprite *); +typedef void (*AffineAnimCmdFunc)(u8 matrixNum, struct Sprite *); + +#define DUMMY_OAM_DATA \ +{ \ + 160, /* Y (off-screen) */ \ + 0, \ + 0, \ + 0, \ + 0, \ + 0, \ + 304, /* X */ \ + 0, \ + 0, \ + 0, \ + 3, /* lowest priority */ \ + 0, \ + 0 \ +} + +#define ANIM_END 0xFFFF +#define AFFINE_ANIM_END 0x7FFF + +// forward declarations +const union AnimCmd * const gDummySpriteAnimTable[]; +const union AffineAnimCmd * const gDummySpriteAffineAnimTable[]; +const struct SpriteTemplate gDummySpriteTemplate; + +// Unreferenced error message. +// It means "The DMA transfer request table has exceeded its limit." +static const u8 sDmaOverErrorMsg[] = + _"DMA OVER\n" + "DMAてんそう\n" + "リクエストテーブルが\n" + "オーバーしました"; + +// Unreferenced data. +static const u8 sUnknownData[24] = +{ + 0x01, 0x04, 0x10, 0x40, + 0x02, 0x04, 0x08, 0x20, + 0x02, 0x04, 0x08, 0x20, + 0x01, 0x04, 0x10, 0x40, + 0x02, 0x04, 0x08, 0x20, + 0x02, 0x04, 0x08, 0x20, +}; + +static const u8 sCenterToCornerVecTable[3][4][2] = +{ + { // square + { -4, -4 }, + { -8, -8 }, + { -16, -16 }, + { -32, -32 }, + }, + { // horizontal rectangle + { -8, -4 }, + { -16, -4 }, + { -16, -8 }, + { -32, -16 }, + }, + { // vertical rectangle + { -4, -8 }, + { -4, -16 }, + { -8, -16 }, + { -16, -32 }, + }, +}; + +static const struct Sprite sDummySprite = +{ + DUMMY_OAM_DATA, + (union AnimCmd **)gDummySpriteAnimTable, + NULL, + (union AffineAnimCmd **)gDummySpriteAffineAnimTable, + (struct SpriteTemplate *)&gDummySpriteTemplate, + NULL, + SpriteCallbackDummy, + { 304, 160 }, + { 0, 0 }, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0xFF +}; + +const struct OamData gDummyOamData = DUMMY_OAM_DATA; + +static const union AnimCmd sDummyAnim = { ANIM_END }; + +const union AnimCmd * const gDummySpriteAnimTable[] = { &sDummyAnim }; + +static const union AffineAnimCmd sDummyAffineAnim = { AFFINE_ANIM_END }; + +const union AffineAnimCmd * const gDummySpriteAffineAnimTable[] = { &sDummyAffineAnim }; + +const struct SpriteTemplate gDummySpriteTemplate = +{ + 0, + 0xFFFF, + (struct OamData *)&gDummyOamData, + (union AnimCmd **)gDummySpriteAnimTable, + NULL, + (union AffineAnimCmd **)gDummySpriteAffineAnimTable, + SpriteCallbackDummy +}; + +// TODO: Find out what these are used for. +static const u16 sOamBitmasks[9] = +{ + 0xFF00, 0x00FF, 0x001F, + 0xFE00, 0x01FF, 0x03E0, + 0xFC00, 0x03FF, 0xFC00, +}; + +static const AnimFunc sAnimFuncs[] = +{ + ContinueAnim, + BeginAnim, +}; + +static const AnimFunc sAffineAnimFuncs[] = +{ + ContinueAffineAnim, + BeginAffineAnim, +}; + +static const AnimCmdFunc sAnimCmdFuncs[] = +{ + AnimCmd_loop, + AnimCmd_jump, + AnimCmd_end, + AnimCmd_frame, +}; + +static const AffineAnimCmdFunc sAffineAnimCmdFuncs[] = +{ + AffineAnimCmd_loop, + AffineAnimCmd_jump, + AffineAnimCmd_end, + AffineAnimCmd_frame, +}; + +static const struct OamDimensions sOamDimensions[3][4] = +{ + { // square + { 8, 8 }, + { 16, 16 }, + { 32, 32 }, + { 64, 64 }, + }, + { // horizontal rectangle + { 16, 8 }, + { 32, 8 }, + { 32, 16 }, + { 64, 32 }, + }, + { // vertical rectangle + { 8, 16 }, + { 8, 32 }, + { 16, 32 }, + { 32, 64 }, + }, +}; + +extern struct Main gMain; + +static u16 sSpriteTileRangeTags[MAX_SPRITES]; +static u16 sSpriteTileRanges[MAX_SPRITES * 2]; +static struct AffineAnimState sAffineAnimStates[OAM_MATRIX_COUNT]; +static u16 sSpritePaletteTags[16]; + +COMM_4(u8 gSpriteOrder[MAX_SPRITES]) +COMM_4(u8 gSpriteTileAllocBitmap[128]) +COMM_2(s16 gSpriteCoordOffsetX) +COMM_2(u8 gOamLimit) +COMM_2(u16 gReservedSpriteTileCount) +COMM_2(u8 gSpriteCopyRequestCount) +COMM_4(struct SpriteCopyRequest gSpriteCopyRequests[MAX_SPRITE_COPY_REQUESTS]) +COMM_2(s16 gSpriteCoordOffsetY) +COMM_4(struct OamMatrix gOamMatrices[OAM_MATRIX_COUNT]) +COMM_2(bool8 gShouldProcessSpriteCopyRequests) +COMM_2(u32 gOamMatrixAllocBitmap) +COMM_2(u8 gReservedSpritePaletteCount) + +EWRAM_DATA struct Sprite gSprites[MAX_SPRITES + 1] = {0}; +EWRAM_DATA u16 gSpritePriorities[MAX_SPRITES] = {0}; +EWRAM_DATA u8 gAffineAnimsDisabled = {0}; + +void ResetSpriteData(void) +{ + ResetOamRange(0, 128); + ResetAllSprites(); + ClearSpriteCopyRequests(); + ResetAffineAnimData(); + FreeAllSpriteTiles(); + gOamLimit = 64; + gReservedSpriteTileCount = 0; + AllocSpriteTiles(0); + gSpriteCoordOffsetX = 0; + gSpriteCoordOffsetY = 0; +} + +void AnimateSprites(void) +{ + u8 i; + for (i = 0; i < MAX_SPRITES; i++) + { + struct Sprite *sprite = &gSprites[i]; + + if (sprite->inUse) + { + sprite->callback(sprite); + + if (sprite->inUse) + AnimateSprite(sprite); + } + } +} + +void BuildOamBuffer(void) +{ + u8 temp; + UpdateOamCoords(); + BuildSpritePriorities(); + SortSprites(); + temp = gMain.oamLoadDisabled; + gMain.oamLoadDisabled = TRUE; + AddSpritesToOamBuffer(); + CopyMatricesToOamBuffer(); + gMain.oamLoadDisabled = temp; + gShouldProcessSpriteCopyRequests = TRUE; +} + +static void UpdateOamCoords(void) +{ + u8 i; + for (i = 0; i < MAX_SPRITES; i++) + { + struct Sprite *sprite = &gSprites[i]; + if (sprite->inUse && !sprite->invisible) + { + if (sprite->coordOffsetEnabled) + { + sprite->oam.x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX; + sprite->oam.y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY; + } + else + { + sprite->oam.x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX; + sprite->oam.y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY; + } + } + } +} + +static void BuildSpritePriorities(void) +{ + u16 i; + for (i = 0; i < MAX_SPRITES; i++) + { + struct Sprite *sprite = &gSprites[i]; + u16 priority = sprite->subpriority | (sprite->oam.priority << 8); + gSpritePriorities[i] = priority; + } +} + +static void SortSprites(void) +{ + u8 i; + for (i = 1; i < MAX_SPRITES; i++) + { + u8 j = i; + struct Sprite *sprite1 = &gSprites[gSpriteOrder[i - 1]]; + struct Sprite *sprite2 = &gSprites[gSpriteOrder[i]]; + u16 sprite1Priority = gSpritePriorities[gSpriteOrder[i - 1]]; + u16 sprite2Priority = gSpritePriorities[gSpriteOrder[i]]; + s16 sprite1Y = sprite1->oam.y; + s16 sprite2Y = sprite2->oam.y; + + if (sprite1Y >= DISPLAY_HEIGHT) + sprite1Y = sprite1Y - 256; + + if (sprite2Y >= DISPLAY_HEIGHT) + sprite2Y = sprite2Y - 256; + + if (sprite1->oam.affineMode == ST_OAM_AFFINE_DOUBLE + && sprite1->oam.size == 3) + { + u32 shape = sprite1->oam.shape; + if (shape == ST_OAM_SQUARE || shape == 2) + { + if (sprite1Y > 128) + sprite1Y = sprite1Y - 256; + } + } + + if (sprite2->oam.affineMode == ST_OAM_AFFINE_DOUBLE + && sprite2->oam.size == 3) + { + u32 shape = sprite2->oam.shape; + if (shape == ST_OAM_SQUARE || shape == ST_OAM_V_RECTANGLE) + { + if (sprite2Y > 128) + sprite2Y = sprite2Y - 256; + } + } + + while (j > 0 + && ((sprite1Priority > sprite2Priority) + || (sprite1Priority == sprite2Priority && sprite1Y < sprite2Y))) + { + u8 temp = gSpriteOrder[j]; + gSpriteOrder[j] = gSpriteOrder[j - 1]; + gSpriteOrder[j - 1] = temp; + + j--; + + sprite1 = &gSprites[gSpriteOrder[j - 1]]; + sprite2 = &gSprites[gSpriteOrder[j]]; + sprite1Priority = gSpritePriorities[gSpriteOrder[j - 1]]; + sprite2Priority = gSpritePriorities[gSpriteOrder[j]]; + sprite1Y = sprite1->oam.y; + sprite2Y = sprite2->oam.y; + + if (sprite1Y >= DISPLAY_HEIGHT) + sprite1Y = sprite1Y - 256; + + if (sprite2Y >= DISPLAY_HEIGHT) + sprite2Y = sprite2Y - 256; + + if (sprite1->oam.affineMode == ST_OAM_AFFINE_DOUBLE + && sprite1->oam.size == 3) + { + u32 shape = sprite1->oam.shape; + if (shape == ST_OAM_SQUARE || shape == ST_OAM_V_RECTANGLE) + { + if (sprite1Y > 128) + sprite1Y = sprite1Y - 256; + } + } + + if (sprite2->oam.affineMode == ST_OAM_AFFINE_DOUBLE + && sprite2->oam.size == 3) + { + u32 shape = sprite2->oam.shape; + if (shape == ST_OAM_SQUARE || shape == ST_OAM_V_RECTANGLE) + { + if (sprite2Y > 128) + sprite2Y = sprite2Y - 256; + } + } + } + } +} + +static void CopyMatricesToOamBuffer(void) +{ + u8 i; + for (i = 0; i < OAM_MATRIX_COUNT; i++) + { + u32 base = 4 * i; + gMain.oamBuffer[base + 0].affineParam = gOamMatrices[i].a; + gMain.oamBuffer[base + 1].affineParam = gOamMatrices[i].b; + gMain.oamBuffer[base + 2].affineParam = gOamMatrices[i].c; + gMain.oamBuffer[base + 3].affineParam = gOamMatrices[i].d; + } +} + +static void AddSpritesToOamBuffer(void) +{ + u8 i = 0; + u8 oamIndex = 0; + + while (i < MAX_SPRITES) + { + struct Sprite *sprite = &gSprites[gSpriteOrder[i]]; + if (sprite->inUse && !sprite->invisible && AddSpriteToOamBuffer(sprite, &oamIndex)) + break; + i++; + } + + gMain.objCount = oamIndex; + + while (oamIndex < gOamLimit) + { + gMain.oamBuffer[oamIndex] = gDummyOamData; + oamIndex++; + } +} + +u8 CreateSprite(struct SpriteTemplate *template, u16 x, u16 y, u8 subpriority) +{ + u8 i; + + for (i = 0; i < MAX_SPRITES; i++) + if (!gSprites[i].inUse) + return CreateSpriteAt(i, template, x, y, subpriority); + + return MAX_SPRITES; +} + +u8 CreateSpriteAtEnd(struct SpriteTemplate *template, u16 x, u16 y, u8 subpriority) +{ + s16 i; + + for (i = MAX_SPRITES - 1; i > -1; i--) + if (!gSprites[i].inUse) + return CreateSpriteAt(i, template, x, y, subpriority); + + return MAX_SPRITES; +} + +u8 CreateInvisibleSprite(void (*callback)(struct Sprite *)) +{ + u8 index = CreateSprite((struct SpriteTemplate *)&gDummySpriteTemplate, 0, 0, 31); + + if (index == MAX_SPRITES) + { + return MAX_SPRITES; + } + else + { + gSprites[index].invisible = TRUE; + gSprites[index].callback = callback; + return index; + } +} + +static u8 CreateSpriteAt(u8 index, struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority) +{ + struct Sprite *sprite = &gSprites[index]; + + ResetSprite(sprite); + + sprite->inUse = TRUE; + sprite->animBeginning = TRUE; + sprite->affineAnimBeginning = TRUE; + sprite->usingSheet = TRUE; + + sprite->subpriority = subpriority; + sprite->oam = *template->oam; + sprite->anims = template->anims; + sprite->affineAnims = template->affineAnims; + sprite->template = template; + sprite->callback = template->callback; + sprite->pos1.x = x; + sprite->pos1.y = y; + + CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode); + + if (template->tileTag == 0xFFFF) + { + s16 tileNum; + sprite->images = template->images; + tileNum = AllocSpriteTiles((u8)(sprite->images->size / TILE_SIZE_4BPP)); + if (tileNum == -1) + { + ResetSprite(sprite); + return MAX_SPRITES; + } + sprite->oam.tileNum = tileNum; + sprite->usingSheet = FALSE; + sprite->sheetTileStart = 0; + } + else + { + sprite->sheetTileStart = GetSpriteTileStartByTag(template->tileTag); + SetSpriteSheetFrameTileNum(sprite); + } + + if (sprite->oam.affineMode & ST_OAM_AFFINE_ON_MASK) + InitSpriteAffineAnim(sprite); + + if (template->paletteTag != 0xFFFF) + sprite->oam.paletteNum = IndexOfSpritePaletteTag(template->paletteTag); + + return index; +} + +u8 CreateSpriteAndAnimate(struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority) +{ + u8 i; + + for (i = 0; i < MAX_SPRITES; i++) + { + struct Sprite *sprite = &gSprites[i]; + + if (!gSprites[i].inUse) + { + u8 index = CreateSpriteAt(i, template, x, y, subpriority); + + if (index == MAX_SPRITES) + return MAX_SPRITES; + + gSprites[i].callback(sprite); + + if (gSprites[i].inUse) + AnimateSprite(sprite); + + return index; + } + } + + return MAX_SPRITES; +} + +void DestroySprite(struct Sprite *sprite) +{ + if (sprite->inUse) + { + if (!sprite->usingSheet) + { + u16 i; + u16 tileEnd = (sprite->images->size / TILE_SIZE_4BPP) + sprite->oam.tileNum; + for (i = sprite->oam.tileNum; i < tileEnd; i++) + gSpriteTileAllocBitmap[i / 8] &= ~(1 << (i % 8)); + } + ResetSprite(sprite); + } +} + +void ResetOamRange(u8 a, u8 b) +{ + u8 i; + + for (i = a; i < b; i++) + { + struct OamData *oamBuffer = gMain.oamBuffer; + oamBuffer[i] = *(struct OamData *)&gDummyOamData; + } +} + +void LoadOam(void) +{ + if (!gMain.oamLoadDisabled) + CpuCopy32(gMain.oamBuffer, (void *)OAM, sizeof(gMain.oamBuffer)); +} + +static void ClearSpriteCopyRequests(void) +{ + u8 i; + + gShouldProcessSpriteCopyRequests = FALSE; + gSpriteCopyRequestCount = 0; + + for (i = 0; i < MAX_SPRITE_COPY_REQUESTS; i++) + { + gSpriteCopyRequests[i].src = 0; + gSpriteCopyRequests[i].dest = 0; + gSpriteCopyRequests[i].size = 0; + } +} + +static void ResetOamMatrices(void) +{ + u8 i; + for (i = 0; i < OAM_MATRIX_COUNT; i++) + { + // set to identity matrix + gOamMatrices[i].a = 0x0100; + gOamMatrices[i].b = 0x0000; + gOamMatrices[i].c = 0x0000; + gOamMatrices[i].d = 0x0100; + } +} + +void SetOamMatrix(u8 matrixNum, u16 a, u16 b, u16 c, u16 d) +{ + gOamMatrices[matrixNum].a = a; + gOamMatrices[matrixNum].b = b; + gOamMatrices[matrixNum].c = c; + gOamMatrices[matrixNum].d = d; +} + +static void ResetSprite(struct Sprite *sprite) +{ + *sprite = sDummySprite; +} + +void CalcCenterToCornerVec(struct Sprite *sprite, u8 shape, u8 size, u8 affineMode) +{ + u8 x = sCenterToCornerVecTable[shape][size][0]; + u8 y = sCenterToCornerVecTable[shape][size][1]; + + if (affineMode & ST_OAM_AFFINE_DOUBLE_MASK) + { + x *= 2; + y *= 2; + } + + sprite->centerToCornerVecX = x; + sprite->centerToCornerVecY = y; +} + +static s16 AllocSpriteTiles(u16 tileCount) +{ + u16 i; + s16 start; + u16 numTilesFound; + + if (tileCount == 0) + { + for (i = gReservedSpriteTileCount; i < TOTAL_OBJ_TILE_COUNT; i++) + gSpriteTileAllocBitmap[i / 8] &= ~(1 << (i % 8)); + + return 0; + } + + i = gReservedSpriteTileCount; + + for (;;) + { + while ((gSpriteTileAllocBitmap[i / 8] >> (i % 8)) & 1) + { + i++; + + if (i == TOTAL_OBJ_TILE_COUNT) + return -1; + } + + start = i; + numTilesFound = 1; + + while (numTilesFound != tileCount) + { + i++; + + if (i == TOTAL_OBJ_TILE_COUNT) + return -1; + + if (!((gSpriteTileAllocBitmap[i / 8] >> (i % 8)) & 1)) + numTilesFound++; + else + break; + } + + if (numTilesFound == tileCount) + break; + } + + for (i = start; i < tileCount + start; i++) + gSpriteTileAllocBitmap[i / 8] |= (1 << (i % 8)); + + return start; +} + +static u8 SpriteTileAllocBitmapOp(u16 bit, u8 op) +{ + u8 index = bit / 8; + u8 shift = bit % 8; + u8 val = bit % 8; + u8 retVal = 0; + + if (op == 0) + { + val = ~(1 << val); + gSpriteTileAllocBitmap[index] &= val; + } + else if (op == 1) + { + val = (1 << val); + gSpriteTileAllocBitmap[index] |= val; + } + else + { + retVal = 1 << shift; + retVal &= gSpriteTileAllocBitmap[index]; + } + + return retVal; +} + +void SpriteCallbackDummy(struct Sprite *sprite) +{ +} + +void ProcessSpriteCopyRequests(void) +{ + if (gShouldProcessSpriteCopyRequests) + { + u8 i = 0; + + while (gSpriteCopyRequestCount > 0) + { + CpuCopy16(gSpriteCopyRequests[i].src, gSpriteCopyRequests[i].dest, gSpriteCopyRequests[i].size); + gSpriteCopyRequestCount--; + i++; + } + + gShouldProcessSpriteCopyRequests = FALSE; + } +} + +static void RequestSpriteFrameImageCopy(u16 index, u16 tileNum, struct SpriteFrameImage *images) +{ + if (gSpriteCopyRequestCount < MAX_SPRITE_COPY_REQUESTS) + { + gSpriteCopyRequests[gSpriteCopyRequestCount].src = images[index].data; + gSpriteCopyRequests[gSpriteCopyRequestCount].dest = (u8 *)OBJ_VRAM0 + TILE_SIZE_4BPP * tileNum; + gSpriteCopyRequests[gSpriteCopyRequestCount].size = images[index].size; + gSpriteCopyRequestCount++; + } +} + +void RequestSpriteCopy(u8 *src, u8 *dest, u16 size) +{ + if (gSpriteCopyRequestCount < MAX_SPRITE_COPY_REQUESTS) + { + gSpriteCopyRequests[gSpriteCopyRequestCount].src = src; + gSpriteCopyRequests[gSpriteCopyRequestCount].dest = dest; + gSpriteCopyRequests[gSpriteCopyRequestCount].size = size; + gSpriteCopyRequestCount++; + } +} + +static void CopyFromSprites(u8 *dest) +{ + u32 i; + u8 *src = (u8 *)gSprites; + for (i = 0; i < sizeof(struct Sprite) * MAX_SPRITES; i++) + { + *dest = *src; + dest++; + src++; + } +} + +static void CopyToSprites(u8 *src) +{ + u32 i; + u8 *dest = (u8 *)gSprites; + for (i = 0; i < sizeof(struct Sprite) * MAX_SPRITES; i++) + { + *dest = *src; + src++; + dest++; + } +} + +static void ResetAllSprites(void) +{ + u8 i; + + for (i = 0; i < MAX_SPRITES; i++) + { + ResetSprite(&gSprites[i]); + gSpriteOrder[i] = i; + } + + ResetSprite(&gSprites[i]); + sub_814A590(); +} + +void FreeSpriteTiles(struct Sprite *sprite) +{ + if (sprite->template->tileTag != 0xFFFF) + FreeSpriteTilesByTag(sprite->template->tileTag); +} + +void FreeSpritePalette(struct Sprite *sprite) +{ + FreeSpritePaletteByTag(sprite->template->paletteTag); +} + +void FreeSpriteOamMatrix(struct Sprite *sprite) +{ + if (sprite->oam.affineMode & ST_OAM_AFFINE_ON_MASK) + { + FreeOamMatrix(sprite->oam.matrixNum); + sprite->oam.affineMode = ST_OAM_AFFINE_OFF; + } +} + +void DestroySpriteAndFreeResources(struct Sprite *sprite) +{ + FreeSpriteTiles(sprite); + FreeSpritePalette(sprite); + FreeSpriteOamMatrix(sprite); + DestroySprite(sprite); +} + +void sub_800142C(u32 a1, u32 a2, u16 *a3, u16 a4, u32 a5) +{ + u16 *d = a3; + struct OamData *oam = &gMain.oamBuffer[gMain.objCount]; + while (!(gMain.objCount & 0x80) && (s16)(d[0] + 1) != 0) + { + u16 *x = (u16 *)oam; + x[0] = (d[0] & sOamBitmasks[0]) | ((d[0] + a2) & sOamBitmasks[1]) | ((a4 & sOamBitmasks[2]) << 8); + x[1] = (d[1] & sOamBitmasks[3]) | ((d[1] + a1) & sOamBitmasks[4]) | ((a4 & sOamBitmasks[5]) << 4); + x[2] = (d[2] & sOamBitmasks[6]) | ((d[2] + a5) & sOamBitmasks[7]) | (a4 & sOamBitmasks[8]); + oam++; + gMain.objCount++; + d += 3; + } +} + +void AnimateSprite(struct Sprite *sprite) +{ + sAnimFuncs[sprite->animBeginning](sprite); + + if (!gAffineAnimsDisabled) + sAffineAnimFuncs[sprite->affineAnimBeginning](sprite); +} + +static void BeginAnim(struct Sprite *sprite) +{ + s16 imageValue; + u8 duration; + u8 hFlip; + u8 vFlip; + + sprite->animCmdIndex = 0; + sprite->animEnded = FALSE; + sprite->animLoopCounter = 0; + imageValue = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.imageValue; + + if (imageValue != -1) + { + sprite->animBeginning = FALSE; + duration = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.duration; + hFlip = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.hFlip; + vFlip = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.vFlip; + + if (duration) + duration--; + + sprite->animDelayCounter = duration; + + if (!(sprite->oam.affineMode & ST_OAM_AFFINE_ON_MASK)) + SetSpriteOamFlipBits(sprite, hFlip, vFlip); + + if (sprite->usingSheet) + sprite->oam.tileNum = sprite->sheetTileStart + imageValue; + else + RequestSpriteFrameImageCopy(imageValue, sprite->oam.tileNum, sprite->images); + } +} + +static void ContinueAnim(struct Sprite *sprite) +{ + if (sprite->animDelayCounter) + { + u8 hFlip; + u8 vFlip; + DecrementAnimDelayCounter(sprite); + hFlip = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.hFlip; + vFlip = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.vFlip; + if (!(sprite->oam.affineMode & ST_OAM_AFFINE_ON_MASK)) + SetSpriteOamFlipBits(sprite, hFlip, vFlip); + } + else if (!sprite->animPaused) + { + s16 type; + s16 funcIndex; + sprite->animCmdIndex++; + type = sprite->anims[sprite->animNum][sprite->animCmdIndex].type; + funcIndex = 3; + if (type < 0) + funcIndex = type + 3; + sAnimCmdFuncs[funcIndex](sprite); + } +} + +static void AnimCmd_frame(struct Sprite *sprite) +{ + s16 imageValue; + u8 duration; + u8 hFlip; + u8 vFlip; + + imageValue = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.imageValue; + duration = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.duration; + hFlip = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.hFlip; + vFlip = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.vFlip; + + if (duration) + duration--; + + sprite->animDelayCounter = duration; + + if (!(sprite->oam.affineMode & ST_OAM_AFFINE_ON_MASK)) + SetSpriteOamFlipBits(sprite, hFlip, vFlip); + + if (sprite->usingSheet) + sprite->oam.tileNum = sprite->sheetTileStart + imageValue; + else + RequestSpriteFrameImageCopy(imageValue, sprite->oam.tileNum, sprite->images); +} + +static void AnimCmd_end(struct Sprite *sprite) +{ + sprite->animCmdIndex--; + sprite->animEnded = TRUE; +} + +static void AnimCmd_jump(struct Sprite *sprite) +{ + s16 imageValue; + u8 duration; + u8 hFlip; + u8 vFlip; + + sprite->animCmdIndex = sprite->anims[sprite->animNum][sprite->animCmdIndex].jump.target; + + imageValue = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.imageValue; + duration = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.duration; + hFlip = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.hFlip; + vFlip = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.vFlip; + + if (duration) + duration--; + + sprite->animDelayCounter = duration; + + if (!(sprite->oam.affineMode & ST_OAM_AFFINE_ON_MASK)) + SetSpriteOamFlipBits(sprite, hFlip, vFlip); + + if (sprite->usingSheet) + sprite->oam.tileNum = sprite->sheetTileStart + imageValue; + else + RequestSpriteFrameImageCopy(imageValue, sprite->oam.tileNum, sprite->images); +} + +static void AnimCmd_loop(struct Sprite *sprite) +{ + if (sprite->animLoopCounter) + ContinueAnimLoop(sprite); + else + BeginAnimLoop(sprite); +} + +static void BeginAnimLoop(struct Sprite *sprite) +{ + sprite->animLoopCounter = sprite->anims[sprite->animNum][sprite->animCmdIndex].loop.count; + JumpToTopOfAnimLoop(sprite); + ContinueAnim(sprite); +} + +static void ContinueAnimLoop(struct Sprite *sprite) +{ + sprite->animLoopCounter--; + JumpToTopOfAnimLoop(sprite); + ContinueAnim(sprite); +} + +static void JumpToTopOfAnimLoop(struct Sprite *sprite) +{ + if (sprite->animLoopCounter) + { + sprite->animCmdIndex--; + + while (sprite->anims[sprite->animNum][sprite->animCmdIndex - 1].type != -3) + { + if (sprite->animCmdIndex == 0) + break; + sprite->animCmdIndex--; + } + + sprite->animCmdIndex--; + } +} + +static void BeginAffineAnim(struct Sprite *sprite) +{ + if ((sprite->oam.affineMode & ST_OAM_AFFINE_ON_MASK) && sprite->affineAnims[0][0].type != 32767) + { + struct AffineAnimFrameCmd frameCmd; + u8 matrixNum = GetSpriteMatrixNum(sprite); + AffineAnimStateRestartAnim(matrixNum); + GetAffineAnimFrame(matrixNum, sprite, &frameCmd); + sprite->affineAnimBeginning = FALSE; + sprite->affineAnimEnded = FALSE; + ApplyAffineAnimFrame(matrixNum, &frameCmd); + sAffineAnimStates[matrixNum].delayCounter = frameCmd.duration; + } +} + +static void ContinueAffineAnim(struct Sprite *sprite) +{ + if (sprite->oam.affineMode & ST_OAM_AFFINE_ON_MASK) + { + u8 matrixNum = GetSpriteMatrixNum(sprite); + + if (sAffineAnimStates[matrixNum].delayCounter) + { + AffineAnimDelay(matrixNum, sprite); + } + else if (!sprite->affineAnimPaused) + { + s16 type; + s16 funcIndex; + sAffineAnimStates[matrixNum].animCmdIndex++; + type = sprite->affineAnims[sAffineAnimStates[matrixNum].animNum][sAffineAnimStates[matrixNum].animCmdIndex].type; + funcIndex = 3; + if (type >= 32765) + funcIndex = type - 32765; + sAffineAnimCmdFuncs[funcIndex](matrixNum, sprite); + } + } +} + +static void AffineAnimDelay(u8 matrixNum, struct Sprite *sprite) +{ + if (!DecrementAffineAnimDelayCounter(sprite, matrixNum)) + { + struct AffineAnimFrameCmd frameCmd; + GetAffineAnimFrame(matrixNum, sprite, &frameCmd); + ApplyAffineAnimFrameRelativeAndUpdateMatrix(matrixNum, &frameCmd); + } +} + +static void AffineAnimCmd_loop(u8 matrixNum, struct Sprite *sprite) +{ + if (sAffineAnimStates[matrixNum].loopCounter) + ContinueAffineAnimLoop(matrixNum, sprite); + else + BeginAffineAnimLoop(matrixNum, sprite); +} + +static void BeginAffineAnimLoop(u8 matrixNum, struct Sprite *sprite) +{ + sAffineAnimStates[matrixNum].loopCounter = sprite->affineAnims[sAffineAnimStates[matrixNum].animNum][sAffineAnimStates[matrixNum].animCmdIndex].loop.count; + JumpToTopOfAffineAnimLoop(matrixNum, sprite); + ContinueAffineAnim(sprite); +} + +static void ContinueAffineAnimLoop(u8 matrixNum, struct Sprite *sprite) +{ + sAffineAnimStates[matrixNum].loopCounter--; + JumpToTopOfAffineAnimLoop(matrixNum, sprite); + ContinueAffineAnim(sprite); +} + +static void JumpToTopOfAffineAnimLoop(u8 matrixNum, struct Sprite *sprite) +{ + if (sAffineAnimStates[matrixNum].loopCounter) + { + sAffineAnimStates[matrixNum].animCmdIndex--; + + while (sprite->affineAnims[sAffineAnimStates[matrixNum].animNum][sAffineAnimStates[matrixNum].animCmdIndex - 1].type != 32765) + { + if (sAffineAnimStates[matrixNum].animCmdIndex == 0) + break; + sAffineAnimStates[matrixNum].animCmdIndex--; + } + + sAffineAnimStates[matrixNum].animCmdIndex--; + } +} + +static void AffineAnimCmd_jump(u8 matrixNum, struct Sprite *sprite) +{ + struct AffineAnimFrameCmd frameCmd; + sAffineAnimStates[matrixNum].animCmdIndex = sprite->affineAnims[sAffineAnimStates[matrixNum].animNum][sAffineAnimStates[matrixNum].animCmdIndex].jump.target; + GetAffineAnimFrame(matrixNum, sprite, &frameCmd); + ApplyAffineAnimFrame(matrixNum, &frameCmd); + sAffineAnimStates[matrixNum].delayCounter = frameCmd.duration; +} + +static void AffineAnimCmd_end(u8 matrixNum, struct Sprite *sprite) +{ + struct AffineAnimFrameCmd dummyFrameCmd = {0}; + sprite->affineAnimEnded = TRUE; + sAffineAnimStates[matrixNum].animCmdIndex--; + ApplyAffineAnimFrameRelativeAndUpdateMatrix(matrixNum, &dummyFrameCmd); +} + +static void AffineAnimCmd_frame(u8 matrixNum, struct Sprite *sprite) +{ + struct AffineAnimFrameCmd frameCmd; + GetAffineAnimFrame(matrixNum, sprite, &frameCmd); + ApplyAffineAnimFrame(matrixNum, &frameCmd); + sAffineAnimStates[matrixNum].delayCounter = frameCmd.duration; +} + +static void CopyOamMatrix(u8 destMatrixIndex, struct OamMatrix *srcMatrix) +{ + gOamMatrices[destMatrixIndex].a = srcMatrix->a; + gOamMatrices[destMatrixIndex].b = srcMatrix->b; + gOamMatrices[destMatrixIndex].c = srcMatrix->c; + gOamMatrices[destMatrixIndex].d = srcMatrix->d; +} + +static u8 GetSpriteMatrixNum(struct Sprite *sprite) +{ + u8 matrixNum = 0; + if (sprite->oam.affineMode & ST_OAM_AFFINE_ON_MASK) + matrixNum = sprite->oam.matrixNum; + return matrixNum; +} + +static void SetSpriteOamFlipBits(struct Sprite *sprite, u8 hFlip, u8 vFlip) +{ + sprite->oam.matrixNum &= 0x7; + sprite->oam.matrixNum |= (((hFlip ^ sprite->hFlip) & 1) << 3); + sprite->oam.matrixNum |= (((vFlip ^ sprite->vFlip) & 1) << 4); +} + +static void AffineAnimStateRestartAnim(u8 matrixNum) +{ + sAffineAnimStates[matrixNum].animCmdIndex = 0; + sAffineAnimStates[matrixNum].delayCounter = 0; + sAffineAnimStates[matrixNum].loopCounter = 0; +} + +static void AffineAnimStateStartAnim(u8 matrixNum, u8 animNum) +{ + sAffineAnimStates[matrixNum].animNum = animNum; + sAffineAnimStates[matrixNum].animCmdIndex = 0; + sAffineAnimStates[matrixNum].delayCounter = 0; + sAffineAnimStates[matrixNum].loopCounter = 0; + sAffineAnimStates[matrixNum].xScale = 0x0100; + sAffineAnimStates[matrixNum].yScale = 0x0100; + sAffineAnimStates[matrixNum].rotation = 0; +} + +static void AffineAnimStateReset(u8 matrixNum) +{ + sAffineAnimStates[matrixNum].animNum = 0; + sAffineAnimStates[matrixNum].animCmdIndex = 0; + sAffineAnimStates[matrixNum].delayCounter = 0; + sAffineAnimStates[matrixNum].loopCounter = 0; + sAffineAnimStates[matrixNum].xScale = 0x0100; + sAffineAnimStates[matrixNum].yScale = 0x0100; + sAffineAnimStates[matrixNum].rotation = 0; +} + +static void ApplyAffineAnimFrameAbsolute(u8 matrixNum, struct AffineAnimFrameCmd *frameCmd) +{ + sAffineAnimStates[matrixNum].xScale = frameCmd->xScale; + sAffineAnimStates[matrixNum].yScale = frameCmd->yScale; + sAffineAnimStates[matrixNum].rotation = frameCmd->rotation << 8; +} + +static void DecrementAnimDelayCounter(struct Sprite *sprite) +{ + if (!sprite->animPaused) + sprite->animDelayCounter--; +} + +static bool8 DecrementAffineAnimDelayCounter(struct Sprite *sprite, u8 matrixNum) +{ + if (!sprite->affineAnimPaused) + --sAffineAnimStates[matrixNum].delayCounter; + return sprite->affineAnimPaused; +} + +static void ApplyAffineAnimFrameRelativeAndUpdateMatrix(u8 matrixNum, struct AffineAnimFrameCmd *frameCmd) +{ + struct ObjAffineSrcData srcData; + struct OamMatrix matrix; + sAffineAnimStates[matrixNum].xScale += frameCmd->xScale; + sAffineAnimStates[matrixNum].yScale += frameCmd->yScale; + sAffineAnimStates[matrixNum].rotation = (sAffineAnimStates[matrixNum].rotation + (frameCmd->rotation << 8)) & ~0xFF; + srcData.xScale = ConvertScaleParam(sAffineAnimStates[matrixNum].xScale); + srcData.yScale = ConvertScaleParam(sAffineAnimStates[matrixNum].yScale); + srcData.rotation = sAffineAnimStates[matrixNum].rotation; + ObjAffineSet(&srcData, &matrix, 1, 2); + CopyOamMatrix(matrixNum, &matrix); +} + +static s16 ConvertScaleParam(s16 scale) +{ + s32 val = 0x10000; + return val / scale; +} + +static void GetAffineAnimFrame(u8 matrixNum, struct Sprite *sprite, struct AffineAnimFrameCmd *frameCmd) +{ + frameCmd->xScale = sprite->affineAnims[sAffineAnimStates[matrixNum].animNum][sAffineAnimStates[matrixNum].animCmdIndex].frame.xScale; + frameCmd->yScale = sprite->affineAnims[sAffineAnimStates[matrixNum].animNum][sAffineAnimStates[matrixNum].animCmdIndex].frame.yScale; + frameCmd->rotation = sprite->affineAnims[sAffineAnimStates[matrixNum].animNum][sAffineAnimStates[matrixNum].animCmdIndex].frame.rotation; + frameCmd->duration = sprite->affineAnims[sAffineAnimStates[matrixNum].animNum][sAffineAnimStates[matrixNum].animCmdIndex].frame.duration; +} + +static void ApplyAffineAnimFrame(u8 matrixNum, struct AffineAnimFrameCmd *frameCmd) +{ + struct AffineAnimFrameCmd dummyFrameCmd = {0}; + + if (frameCmd->duration) + { + frameCmd->duration--; + ApplyAffineAnimFrameRelativeAndUpdateMatrix(matrixNum, frameCmd); + } + else + { + ApplyAffineAnimFrameAbsolute(matrixNum, frameCmd); + ApplyAffineAnimFrameRelativeAndUpdateMatrix(matrixNum, &dummyFrameCmd); + } +} + +void StartSpriteAnim(struct Sprite *sprite, u8 animNum) +{ + sprite->animNum = animNum; + sprite->animBeginning = TRUE; + sprite->animEnded = FALSE; +} + +void StartSpriteAnimIfDifferent(struct Sprite *sprite, u8 animNum) +{ + if (sprite->animNum != animNum) + StartSpriteAnim(sprite, animNum); +} + +void SeekSpriteAnim(struct Sprite *sprite, u8 animCmdIndex) +{ + u8 temp = sprite->animPaused; + sprite->animCmdIndex = animCmdIndex - 1; + sprite->animDelayCounter = 0; + sprite->animBeginning = FALSE; + sprite->animEnded = FALSE; + sprite->animPaused = FALSE; + ContinueAnim(sprite); + if (sprite->animDelayCounter) + sprite->animDelayCounter++; + sprite->animPaused = temp; +} + +void StartSpriteAffineAnim(struct Sprite *sprite, u8 animNum) +{ + u8 matrixNum = GetSpriteMatrixNum(sprite); + AffineAnimStateStartAnim(matrixNum, animNum); + sprite->affineAnimBeginning = TRUE; + sprite->affineAnimEnded = FALSE; +} + +void StartSpriteAffineAnimIfDifferent(struct Sprite *sprite, u8 animNum) +{ + u8 matrixNum = GetSpriteMatrixNum(sprite); + if (sAffineAnimStates[matrixNum].animNum != animNum) + StartSpriteAffineAnim(sprite, animNum); +} + +void ChangeSpriteAffineAnim(struct Sprite *sprite, u8 animNum) +{ + u8 matrixNum = GetSpriteMatrixNum(sprite); + sAffineAnimStates[matrixNum].animNum = animNum; + sprite->affineAnimBeginning = TRUE; + sprite->affineAnimEnded = FALSE; +} + +void ChangeSpriteAffineAnimIfDifferent(struct Sprite *sprite, u8 animNum) +{ + u8 matrixNum = GetSpriteMatrixNum(sprite); + if (sAffineAnimStates[matrixNum].animNum != animNum) + ChangeSpriteAffineAnim(sprite, animNum); +} + +void SetSpriteSheetFrameTileNum(struct Sprite *sprite) +{ + if (sprite->usingSheet) + { + s16 tileOffset = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.imageValue; + if (tileOffset < 0) + tileOffset = 0; + sprite->oam.tileNum = sprite->sheetTileStart + tileOffset; + } +} + +static void ResetAffineAnimData(void) +{ + u8 i; + + gAffineAnimsDisabled = 0; + gOamMatrixAllocBitmap = 0; + + ResetOamMatrices(); + + for (i = 0; i < OAM_MATRIX_COUNT; i++) + AffineAnimStateReset(i); +} + +u8 AllocOamMatrix(void) +{ + u8 i = 0; + u32 bit = 1; + u32 bitmap = gOamMatrixAllocBitmap; + + while (i < OAM_MATRIX_COUNT) + { + if (!(bitmap & bit)) + { + gOamMatrixAllocBitmap |= bit; + return i; + } + + i++; + bit <<= 1; + } + + return 0xFF; +} + +void FreeOamMatrix(u8 matrixNum) +{ + u8 i = 0; + u32 bit = 1; + + while (i < matrixNum) + { + i++; + bit <<= 1; + } + + gOamMatrixAllocBitmap &= ~bit; + SetOamMatrix(matrixNum, 0x100, 0, 0, 0x100); +} + +void InitSpriteAffineAnim(struct Sprite *sprite) +{ + u8 matrixNum = AllocOamMatrix(); + if (matrixNum != 0xFF) + { + CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode); + sprite->oam.matrixNum = matrixNum; + sprite->affineAnimBeginning = TRUE; + AffineAnimStateReset(matrixNum); + } +} + +void SetOamMatrixRotationScaling(u8 matrixNum, s16 xScale, s16 yScale, u16 rotation) +{ + struct ObjAffineSrcData srcData; + struct OamMatrix matrix; + srcData.xScale = ConvertScaleParam(xScale); + srcData.yScale = ConvertScaleParam(yScale); + srcData.rotation = rotation; + ObjAffineSet(&srcData, &matrix, 1, 2); + CopyOamMatrix(matrixNum, &matrix); +} + +u16 LoadSpriteSheet(struct SpriteSheet *sheet) +{ + s16 tileStart = AllocSpriteTiles(sheet->size / TILE_SIZE_4BPP); + + if (tileStart < 0) + { + return 0; + } + else + { + AddSpriteTileRange(sheet->tag, (u16)tileStart, sheet->size / TILE_SIZE_4BPP); + CpuCopy16(sheet->data, (u8 *)OBJ_VRAM0 + TILE_SIZE_4BPP * tileStart, sheet->size); + return (u16)tileStart; + } +} + +void LoadSpriteSheets(struct SpriteSheet *sheets) +{ + u8 i; + for (i = 0; sheets[i].data != NULL; i++) + LoadSpriteSheet(&sheets[i]); +} + +u16 AllocTilesForSpriteSheet(struct SpriteSheet *sheet) +{ + s16 tileStart = AllocSpriteTiles(sheet->size / TILE_SIZE_4BPP); + + if (tileStart < 0) + { + return 0; + } + else + { + AddSpriteTileRange(sheet->tag, (u16)tileStart, sheet->size / TILE_SIZE_4BPP); + return (u16)tileStart; + } +} + +void AllocTilesForSpriteSheets(struct SpriteSheet *sheets) +{ + u8 i; + for (i = 0; sheets[i].data != NULL; i++) + AllocTilesForSpriteSheet(&sheets[i]); +} + +void LoadTilesForSpriteSheet(struct SpriteSheet *sheet) +{ + u8 *data = sheet->data; + u16 tileStart = GetSpriteTileStartByTag(sheet->tag); + CpuCopy16(data, (u8 *)OBJ_VRAM0 + TILE_SIZE_4BPP * tileStart, sheet->size); +} + +void LoadTilesForSpriteSheets(struct SpriteSheet *sheets) +{ + u8 i; + for (i = 0; sheets[i].data != NULL; i++) + LoadTilesForSpriteSheet(&sheets[i]); +} + +void FreeSpriteTilesByTag(u16 tag) +{ + u8 index = IndexOfSpriteTileTag(tag); + if (index != 0xFF) + { + u16 i; + u16 *rangeStarts; + u16 *rangeCounts; + u16 start; + u16 count; + rangeStarts = sSpriteTileRanges; + start = rangeStarts[index * 2]; + rangeCounts = sSpriteTileRanges + 1; + count = rangeCounts[index * 2]; + + for (i = start; i < start + count; i++) + gSpriteTileAllocBitmap[i / 8] &= ~(1 << (i % 8)); + + sSpriteTileRangeTags[index] = 0xFFFF; + } +} + +void FreeAllSpriteTiles(void) +{ + u8 i; + + for (i = 0; i < MAX_SPRITES; i++) + { + sSpriteTileRangeTags[i] = 0xFFFF; + SET_SPRITE_TILE_RANGE(i, 0, 0); + } +} + +u16 GetSpriteTileStartByTag(u16 tag) +{ + u8 index = IndexOfSpriteTileTag(tag); + if (index == 0xFF) + return 0xFFFF; + return sSpriteTileRanges[index * 2]; +} + +static u8 IndexOfSpriteTileTag(u16 tag) +{ + u8 i; + + for (i = 0; i < MAX_SPRITES; i++) + if (sSpriteTileRangeTags[i] == tag) + return i; + + return 0xFF; +} + +u16 GetSpriteTileTagByTileStart(u16 start) +{ + u8 i; + + for (i = 0; i < MAX_SPRITES; i++) + { + if (sSpriteTileRangeTags[i] != 0xFFFF && sSpriteTileRanges[i * 2] == start) + return sSpriteTileRangeTags[i]; + } + + return 0xFFFF; +} + +static void AddSpriteTileRange(u16 tag, u16 start, u16 count) +{ + u8 freeIndex = IndexOfSpriteTileTag(0xFFFF); + sSpriteTileRangeTags[freeIndex] = tag; + SET_SPRITE_TILE_RANGE(freeIndex, start, count); +} + +void RequestSpriteSheetCopy(struct SpriteSheet *sheet) +{ + u8 *data = sheet->data; + u16 tileStart = GetSpriteTileStartByTag(sheet->tag); + RequestSpriteCopy(data, (u8 *)OBJ_VRAM0 + tileStart * TILE_SIZE_4BPP, sheet->size); +} + +u16 LoadSpriteSheetDeferred(struct SpriteSheet *sheet) +{ + s16 tileStart = AllocSpriteTiles(sheet->size / TILE_SIZE_4BPP); + + if (tileStart < 0) + { + return 0; + } + else + { + AddSpriteTileRange(sheet->tag, (u16)tileStart, sheet->size / TILE_SIZE_4BPP); + RequestSpriteSheetCopy(sheet); + return (u16)tileStart; + } +} + +void FreeAllSpritePalettes(void) +{ + u8 i; + gReservedSpritePaletteCount = 0; + for (i = 0; i < 16; i++) + sSpritePaletteTags[i] = 0xFFFF; +} + +u8 LoadSpritePalette(struct SpritePalette *palette) +{ + u8 index = IndexOfSpritePaletteTag(palette->tag); + + if (index != 0xFF) + return index; + + index = IndexOfSpritePaletteTag(0xFFFF); + + if (index == 0xFF) + { + return 0xFF; + } + else + { + sSpritePaletteTags[index] = palette->tag; + ApplySpritePalette(palette->data, index * 16); + return index; + } +} + +void LoadSpritePalettes(struct SpritePalette *palettes) +{ + u8 i; + for (i = 0; palettes[i].data != NULL; i++) + if (LoadSpritePalette(&palettes[i]) == 0xFF) + break; +} + +static void ApplySpritePalette(u8 *src, u16 paletteOffset) +{ + gpu_pal_apply(src, paletteOffset + 0x100, 32); +} + +u8 AllocSpritePalette(u16 tag) +{ + u8 index = IndexOfSpritePaletteTag(0xFFFF); + if (index == 0xFF) + { + return 0xFF; + } + else + { + sSpritePaletteTags[index] = tag; + return index; + } +} + +u8 IndexOfSpritePaletteTag(u16 tag) +{ + u8 i; + for (i = gReservedSpritePaletteCount; i < 16; i++) + if (sSpritePaletteTags[i] == tag) + return i; + + return 0xFF; +} + +u16 GetSpritePaletteTagByPaletteNum(u8 paletteNum) +{ + return sSpritePaletteTags[paletteNum]; +} + +void FreeSpritePaletteByTag(u16 tag) +{ + u8 index = IndexOfSpritePaletteTag(tag); + if (index != 0xFF) + sSpritePaletteTags[index] = 0xFFFF; +} + +void SetSubspriteTables(struct Sprite *sprite, struct SubspriteTable *subspriteTables) +{ + sprite->subspriteTables = subspriteTables; + sprite->subspriteTableNum = 0; + sprite->subspriteMode = SUBSPRITES_ON; +} + +bool8 AddSpriteToOamBuffer(struct Sprite *sprite, u8 *oamIndex) +{ + if (*oamIndex >= gOamLimit) + return 1; + + if (!sprite->subspriteTables || sprite->subspriteMode == SUBSPRITES_OFF) + { + gMain.oamBuffer[*oamIndex] = sprite->oam; + (*oamIndex)++; + return 0; + } + else + { + return AddSubspritesToOamBuffer(sprite, &gMain.oamBuffer[*oamIndex], oamIndex); + } +} + +bool8 AddSubspritesToOamBuffer(struct Sprite *sprite, struct OamData *destOam, u8 *oamIndex) +{ + struct SubspriteTable *subspriteTable; + struct OamData *oam; + + if (*oamIndex >= gOamLimit) + return 1; + + subspriteTable = &sprite->subspriteTables[sprite->subspriteTableNum]; + oam = &sprite->oam; + + if (!subspriteTable || !subspriteTable->subsprites) + { + *destOam = *oam; + (*oamIndex)++; + return 0; + } + else + { + u16 tileNum; + u16 baseX; + u16 baseY; + u8 subspriteCount; + u8 hFlip; + u8 vFlip; + u8 i; + + tileNum = oam->tileNum; + subspriteCount = subspriteTable->subspriteCount; + hFlip = ((s32)oam->matrixNum >> 3) & 1; + vFlip = ((s32)oam->matrixNum >> 4) & 1; + baseX = oam->x - sprite->centerToCornerVecX; + baseY = oam->y - sprite->centerToCornerVecY; + + for (i = 0; i < subspriteCount; i++, (*oamIndex)++) + { + u16 x; + u16 y; + + if (*oamIndex >= gOamLimit) + return 1; + + x = subspriteTable->subsprites[i].x; + y = subspriteTable->subsprites[i].y; + + if (hFlip) + { + s8 width = sOamDimensions[subspriteTable->subsprites[i].shape][subspriteTable->subsprites[i].size].width; + s16 right = x; + right += width; + x = right; + x = ~x + 1; + } + + if (vFlip) + { + s8 height = sOamDimensions[subspriteTable->subsprites[i].shape][subspriteTable->subsprites[i].size].height; + s16 bottom = y; + bottom += height; + y = bottom; + y = ~y + 1; + } + + destOam[i] = *oam; + destOam[i].shape = subspriteTable->subsprites[i].shape; + destOam[i].size = subspriteTable->subsprites[i].size; + destOam[i].x = (s16)baseX + (s16)x; + destOam[i].y = baseY + y; + destOam[i].tileNum = tileNum + subspriteTable->subsprites[i].tileOffset; + + if (sprite->subspriteMode != SUBSPRITES_IGNORE_PRIORITY) + destOam[i].priority = subspriteTable->subsprites[i].priority; + } + } + + return 0; +} diff --git a/tools/preproc/Makefile b/tools/preproc/Makefile index f504e45bd..24f60e3f6 100644 --- a/tools/preproc/Makefile +++ b/tools/preproc/Makefile @@ -2,9 +2,11 @@ CXX := g++ CXXFLAGS := -std=c++14 -O2 -Wall -Wno-switch -SRCS := asm_file.cpp charmap.cpp preproc.cpp utf8.cpp +SRCS := asm_file.cpp c_file.cpp charmap.cpp preproc.cpp string_parser.cpp \ + utf8.cpp -HEADERS := asm_file.h char_util.h charmap.h preproc.h utf8.h +HEADERS := asm_file.h c_file.h char_util.h charmap.h preproc.h string_parser.h \ + utf8.h .PHONY: clean diff --git a/tools/preproc/asm_file.cpp b/tools/preproc/asm_file.cpp index b05ebab3f..b843d640b 100644 --- a/tools/preproc/asm_file.cpp +++ b/tools/preproc/asm_file.cpp @@ -24,6 +24,7 @@ #include "asm_file.h" #include "char_util.h" #include "utf8.h" +#include "string_parser.h" AsmFile::AsmFile(std::string filename) : m_filename(filename) { @@ -36,6 +37,9 @@ AsmFile::AsmFile(std::string filename) : m_filename(filename) m_size = std::ftell(fp); + if (m_size < 0) + FATAL_ERROR("File size of \"%s\" is less than zero.\n", filename.c_str()); + m_buffer = new char[m_size + 1]; std::rewind(fp); @@ -246,169 +250,29 @@ std::string AsmFile::ReadPath() return std::string(&m_buffer[startPos], length); } -// Reads a charmap char or escape sequence. -std::string AsmFile::ReadCharOrEscape() -{ - std::string sequence; - - bool isEscape = (m_buffer[m_pos] == '\\'); - - if (isEscape) - { - m_pos++; - - if (m_buffer[m_pos] == '"') - { - sequence = g_charmap->Char('"'); - - if (sequence.length() == 0) - RaiseError("no mapping exists for double quote"); - - return sequence; - } - else if (m_buffer[m_pos] == '\\') - { - sequence = g_charmap->Char('\\'); - - if (sequence.length() == 0) - RaiseError("no mapping exists for backslash"); - - return sequence; - } - } - - unsigned char c = m_buffer[m_pos]; - - if (c == 0) - { - if (m_pos >= m_size) - RaiseError("unexpected EOF in UTF-8 string"); - else - RaiseError("unexpected null character in UTF-8 string"); - } - - if (IsAscii(c) && !IsAsciiPrintable(c)) - RaiseError("unexpected character U+%X in UTF-8 string", c); - - UnicodeChar unicodeChar = DecodeUtf8(&m_buffer[m_pos]); - m_pos += unicodeChar.encodingLength; - std::int32_t code = unicodeChar.code; - - if (code == -1) - RaiseError("invalid encoding in UTF-8 string"); - - if (isEscape && code >= 128) - RaiseError("escapes using non-ASCII characters are invalid"); - - sequence = isEscape ? g_charmap->Escape(code) : g_charmap->Char(code); - - if (sequence.length() == 0) - { - if (isEscape) - RaiseError("unknown escape '\\%c'", code); - else - RaiseError("unknown character U+%X", code); - } - - return sequence; -} - -// Reads a charmap constant, i.e. "{FOO}". -std::string AsmFile::ReadBracketedConstants() -{ - std::string totalSequence; - - m_pos++; // Assume we're on the left curly bracket. - - while (m_buffer[m_pos] != '}') - { - SkipWhitespace(); - - if (IsIdentifierStartingChar(m_buffer[m_pos])) - { - long startPos = m_pos; - - m_pos++; - - while (IsIdentifierChar(m_buffer[m_pos])) - m_pos++; - - std::string sequence = g_charmap->Constant(std::string(&m_buffer[startPos], m_pos - startPos)); - - if (sequence.length() == 0) - { - m_buffer[m_pos] = 0; - RaiseError("unknown constant '%s'", &m_buffer[startPos]); - } - - totalSequence += sequence; - } - else if (IsAsciiDigit(m_buffer[m_pos])) - { - int value = ReadInteger(255); - - if (value == -1) - RaiseError("integers within curly brackets cannot exceed 255"); - - totalSequence += (char)value; - } - else if (m_buffer[m_pos] == 0) - { - if (m_pos >= m_size) - RaiseError("unexpected EOF after left curly bracket"); - else - RaiseError("unexpected null character within curly brackets"); - } - else - { - if (IsAsciiPrintable(m_buffer[m_pos])) - RaiseError("unexpected character '%c' within curly brackets", m_buffer[m_pos]); - else - RaiseError("unexpected character '\\x%02X' within curly brackets", m_buffer[m_pos]); - } - } - - m_pos++; // Go past the right curly bracket. - - return totalSequence; -} - // Reads a charmap string. int AsmFile::ReadString(unsigned char* s) { SkipWhitespace(); - if (m_buffer[m_pos] != '"') - RaiseError("expected UTF-8 string literal"); - - m_pos++; - - int length = 0; + int length; + StringParser stringParser(m_buffer, m_size); - while (m_buffer[m_pos] != '"') + try { - std::string sequence = (m_buffer[m_pos] == '{') ? ReadBracketedConstants() : ReadCharOrEscape(); - - for (const char& c : sequence) - { - if (length == kMaxStringLength) - RaiseError("mapped string longer than %d bytes", length); - - s[length++] = c; - } + m_pos += stringParser.ParseString(m_pos, s, length); + } + catch (std::runtime_error e) + { + RaiseError(e.what()); } - - m_pos++; // Go past the right quote. SkipWhitespace(); if (ConsumeComma()) { SkipWhitespace(); - int padLength = ReadInteger(kMaxStringLength); - - if (padLength == -1) - RaiseError("pad length greater than maximum length (%d)", kMaxStringLength); + int padLength = ReadPadLength(); while (length < padLength) { @@ -452,7 +316,7 @@ static int ConvertDigit(char c, int radix) } // Reads an integer. If the integer is greater than maxValue, it returns -1. -int AsmFile::ReadInteger(int maxValue) +int AsmFile::ReadPadLength() { if (!IsAsciiDigit(m_buffer[m_pos])) RaiseError("expected integer"); @@ -472,8 +336,8 @@ int AsmFile::ReadInteger(int maxValue) { n = n * radix + digit; - if (n > (unsigned)maxValue) - return -1; + if (n > kMaxStringLength) + RaiseError("pad length greater than maximum length (%d)", kMaxStringLength); m_pos++; } diff --git a/tools/preproc/asm_file.h b/tools/preproc/asm_file.h index 398c46a36..335dbab4b 100644 --- a/tools/preproc/asm_file.h +++ b/tools/preproc/asm_file.h @@ -56,11 +56,9 @@ private: std::string m_filename; bool ConsumeComma(); - int ReadInteger(int maxValue); + int ReadPadLength(); void RemoveComments(); bool CheckForDirective(std::string name); - std::string ReadCharOrEscape(); - std::string ReadBracketedConstants(); void SkipWhitespace(); void ExpectEmptyRestOfLine(); void ReportDiagnostic(const char* type, const char* format, std::va_list args); diff --git a/tools/preproc/c_file.cpp b/tools/preproc/c_file.cpp new file mode 100644 index 000000000..1e4dea359 --- /dev/null +++ b/tools/preproc/c_file.cpp @@ -0,0 +1,199 @@ +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#include <cstdio> +#include <cstdarg> +#include "preproc.h" +#include "c_file.h" +#include "char_util.h" +#include "utf8.h" +#include "string_parser.h" + +CFile::CFile(std::string filename) : m_filename(filename) +{ + FILE *fp = std::fopen(filename.c_str(), "rb"); + + if (fp == NULL) + FATAL_ERROR("Failed to open \"%s\" for reading.\n", filename.c_str()); + + std::fseek(fp, 0, SEEK_END); + + m_size = std::ftell(fp); + + if (m_size < 0) + FATAL_ERROR("File size of \"%s\" is less than zero.\n", filename.c_str()); + + m_buffer = new char[m_size + 1]; + + std::rewind(fp); + + if (std::fread(m_buffer, m_size, 1, fp) != 1) + FATAL_ERROR("Failed to read \"%s\".\n", filename.c_str()); + + m_buffer[m_size] = 0; + + std::fclose(fp); + + m_pos = 0; + m_lineNum = 1; +} + +CFile::CFile(CFile&& other) : m_filename(std::move(other.m_filename)) +{ + m_buffer = other.m_buffer; + m_pos = other.m_pos; + m_size = other.m_size; + m_lineNum = other.m_lineNum; + + other.m_buffer = nullptr; +} + +CFile::~CFile() +{ + delete[] m_buffer; +} + +void CFile::Preproc() +{ + bool inConcatMode = false; + char stringChar = 0; + + while (m_pos < m_size) + { + if (stringChar) + { + if (m_buffer[m_pos] == stringChar) + { + std::putchar(stringChar); + m_pos++; + stringChar = 0; + } + else if (m_buffer[m_pos] == '\\' && m_buffer[m_pos + 1] == stringChar) + { + std::putchar('\\'); + std::putchar(stringChar); + m_pos += 2; + } + else + { + std::putchar(m_buffer[m_pos]); + m_pos++; + } + } + else + { + if (inConcatMode ? m_buffer[m_pos] == '"' + : m_buffer[m_pos] == '_' && m_buffer[m_pos + 1] == '"') + { + if (!inConcatMode) + m_pos++; // skip past underscore + + unsigned char s[kMaxStringLength]; + int length; + StringParser stringParser(m_buffer, m_size); + + try + { + m_pos += stringParser.ParseString(m_pos, s, length); + } + catch (std::runtime_error e) + { + RaiseError(e.what()); + } + + if (!inConcatMode) + { + std::printf("{ "); + } + + inConcatMode = true; + + for (int i = 0; i < length; i++) + printf("0x%02X, ", s[i]); + } + else + { + char c = m_buffer[m_pos++]; + + if (c == '\r') + { + if (m_buffer[m_pos] == '\n') + { + m_pos++; + } + + c = '\n'; + } + + if ((c != ' ' && c != '\t' && c != '\n') && inConcatMode) + { + std::printf("0xFF }"); + inConcatMode = false; + } + + std::putchar(c); + + if (c == '\n') + m_lineNum++; + else if (c == '"') + stringChar = '"'; + else if (m_buffer[m_pos] == '\'') + stringChar = '\''; + } + } + } + + if (inConcatMode) + { + printf("0xFF }"); + RaiseWarning("string at end of file"); + } +} + +// Reports a diagnostic message. +void CFile::ReportDiagnostic(const char* type, const char* format, std::va_list args) +{ + const int bufferSize = 1024; + char buffer[bufferSize]; + std::vsnprintf(buffer, bufferSize, format, args); + std::fprintf(stderr, "%s:%ld: %s: %s\n", m_filename.c_str(), m_lineNum, type, buffer); +} + +#define DO_REPORT(type) \ +do \ +{ \ + std::va_list args; \ + va_start(args, format); \ + ReportDiagnostic(type, format, args); \ + va_end(args); \ +} while (0) + +// Reports an error diagnostic and terminates the program. +void CFile::RaiseError(const char* format, ...) +{ + DO_REPORT("error"); + std::exit(1); +} + +// Reports a warning diagnostic. +void CFile::RaiseWarning(const char* format, ...) +{ + DO_REPORT("warning"); +} diff --git a/tools/preproc/c_file.h b/tools/preproc/c_file.h new file mode 100644 index 000000000..b6041cc00 --- /dev/null +++ b/tools/preproc/c_file.h @@ -0,0 +1,50 @@ +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#ifndef C_FILE_H +#define C_FILE_H + +#include <cstdarg> +#include <cstdint> +#include <string> +#include "preproc.h" + +class CFile +{ +public: + CFile(std::string filename); + CFile(CFile&& other); + CFile(const CFile&) = delete; + ~CFile(); + void Preproc(); + +private: + char* m_buffer; + long m_pos; + long m_size; + long m_lineNum; + std::string m_filename; + + void ReportDiagnostic(const char* type, const char* format, std::va_list args); + void RaiseError(const char* format, ...); + void RaiseWarning(const char* format, ...); +}; + +#endif // C_FILE_H diff --git a/tools/preproc/charmap.cpp b/tools/preproc/charmap.cpp index 573981694..a7bedfe26 100644 --- a/tools/preproc/charmap.cpp +++ b/tools/preproc/charmap.cpp @@ -76,6 +76,9 @@ CharmapReader::CharmapReader(std::string filename) : m_filename(filename) m_size = std::ftell(fp); + if (m_size < 0) + FATAL_ERROR("File size of \"%s\" is less than zero.\n", filename.c_str()); + m_buffer = new char[m_size + 1]; std::rewind(fp); diff --git a/tools/preproc/preproc.cpp b/tools/preproc/preproc.cpp index 4f216f23a..1dd6808c3 100644 --- a/tools/preproc/preproc.cpp +++ b/tools/preproc/preproc.cpp @@ -18,35 +18,29 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. +#include <string> #include <stack> #include "preproc.h" #include "asm_file.h" +#include "c_file.h" #include "charmap.h" Charmap* g_charmap; -int main(int argc, char **argv) +void PreprocAsmFile(std::string filename) { - if (argc != 3) - { - fprintf(stderr, "Usage: %s ASM_FILE CHARMAP_FILE", argv[0]); - return 1; - } - - g_charmap = new Charmap(argv[2]); - std::stack<AsmFile> stack; - stack.push(AsmFile(argv[1])); + stack.push(AsmFile(filename)); for (;;) { while (stack.top().IsAtEnd()) { stack.pop(); - + if (stack.empty()) - return 0; + return; else stack.top().OutputLocation(); } @@ -84,3 +78,55 @@ int main(int argc, char **argv) } } } + +void PreprocCFile(std::string filename) +{ + CFile cFile(filename); + cFile.Preproc(); +} + +char* GetFileExtension(char* filename) +{ + char* extension = filename; + + while (*extension != 0) + extension++; + + while (extension > filename && *extension != '.') + extension--; + + if (extension == filename) + return nullptr; + + extension++; + + if (*extension == 0) + return nullptr; + + return extension; +} + +int main(int argc, char **argv) +{ + if (argc != 3) + { + fprintf(stderr, "Usage: %s SRC_FILE CHARMAP_FILE", argv[0]); + return 1; + } + + g_charmap = new Charmap(argv[2]); + + char* extension = GetFileExtension(argv[1]); + + if (!extension) + FATAL_ERROR("\"%s\" has no file extension.\n", argv[1]); + + if ((extension[0] == 's') && extension[1] == 0) + PreprocAsmFile(argv[1]); + else if ((extension[0] == 'c' || extension[0] == 'i') && extension[1] == 0) + PreprocCFile(argv[1]); + else + FATAL_ERROR("\"%s\" has an unknown file extension of \"%s\".\n", argv[1], extension); + + return 0; +} diff --git a/tools/preproc/preproc.h b/tools/preproc/preproc.h index 926748efd..515f64e07 100644 --- a/tools/preproc/preproc.h +++ b/tools/preproc/preproc.h @@ -21,6 +21,8 @@ #ifndef PREPROC_H #define PREPROC_H +#include <cstdio> +#include <cstdlib> #include "charmap.h" #ifdef _MSC_VER @@ -44,7 +46,7 @@ do \ #endif // _MSC_VER const int kMaxPath = 256; -const int kMaxStringLength = 256; +const int kMaxStringLength = 1024; const unsigned long kMaxCharmapSequenceLength = 16; extern Charmap* g_charmap; diff --git a/tools/preproc/string_parser.cpp b/tools/preproc/string_parser.cpp new file mode 100644 index 000000000..b383f2f4f --- /dev/null +++ b/tools/preproc/string_parser.cpp @@ -0,0 +1,355 @@ +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#include <cstdio> +#include <cstdarg> +#include <stdexcept> +#include "preproc.h" +#include "string_parser.h" +#include "char_util.h" +#include "utf8.h" + +// Reads a charmap char or escape sequence. +std::string StringParser::ReadCharOrEscape() +{ + std::string sequence; + + bool isEscape = (m_buffer[m_pos] == '\\'); + + if (isEscape) + { + m_pos++; + + if (m_buffer[m_pos] == '"') + { + sequence = g_charmap->Char('"'); + + if (sequence.length() == 0) + RaiseError("no mapping exists for double quote"); + + return sequence; + } + else if (m_buffer[m_pos] == '\\') + { + sequence = g_charmap->Char('\\'); + + if (sequence.length() == 0) + RaiseError("no mapping exists for backslash"); + + return sequence; + } + } + + unsigned char c = m_buffer[m_pos]; + + if (c == 0) + { + if (m_pos >= m_size) + RaiseError("unexpected EOF in UTF-8 string"); + else + RaiseError("unexpected null character in UTF-8 string"); + } + + if (IsAscii(c) && !IsAsciiPrintable(c)) + RaiseError("unexpected character U+%X in UTF-8 string", c); + + UnicodeChar unicodeChar = DecodeUtf8(&m_buffer[m_pos]); + m_pos += unicodeChar.encodingLength; + std::int32_t code = unicodeChar.code; + + if (code == -1) + RaiseError("invalid encoding in UTF-8 string"); + + if (isEscape && code >= 128) + RaiseError("escapes using non-ASCII characters are invalid"); + + sequence = isEscape ? g_charmap->Escape(code) : g_charmap->Char(code); + + if (sequence.length() == 0) + { + if (isEscape) + RaiseError("unknown escape '\\%c'", code); + else + RaiseError("unknown character U+%X", code); + } + + return sequence; +} + +// Reads a charmap constant, i.e. "{FOO}". +std::string StringParser::ReadBracketedConstants() +{ + std::string totalSequence; + + m_pos++; // Assume we're on the left curly bracket. + + while (m_buffer[m_pos] != '}') + { + SkipWhitespace(); + + if (IsIdentifierStartingChar(m_buffer[m_pos])) + { + long startPos = m_pos; + + m_pos++; + + while (IsIdentifierChar(m_buffer[m_pos])) + m_pos++; + + std::string sequence = g_charmap->Constant(std::string(&m_buffer[startPos], m_pos - startPos)); + + if (sequence.length() == 0) + { + m_buffer[m_pos] = 0; + RaiseError("unknown constant '%s'", &m_buffer[startPos]); + } + + totalSequence += sequence; + } + else if (IsAsciiDigit(m_buffer[m_pos])) + { + Integer integer = ReadInteger(); + + switch (integer.size) + { + case 1: + totalSequence += (unsigned char)integer.value; + break; + case 2: + totalSequence += (unsigned char)integer.value; + totalSequence += (unsigned char)(integer.value >> 8); + break; + case 4: + totalSequence += (unsigned char)integer.value; + totalSequence += (unsigned char)(integer.value >> 8); + totalSequence += (unsigned char)(integer.value >> 16); + totalSequence += (unsigned char)(integer.value >> 24); + break; + } + } + else if (m_buffer[m_pos] == 0) + { + if (m_pos >= m_size) + RaiseError("unexpected EOF after left curly bracket"); + else + RaiseError("unexpected null character within curly brackets"); + } + else + { + if (IsAsciiPrintable(m_buffer[m_pos])) + RaiseError("unexpected character '%c' within curly brackets", m_buffer[m_pos]); + else + RaiseError("unexpected character '\\x%02X' within curly brackets", m_buffer[m_pos]); + } + } + + m_pos++; // Go past the right curly bracket. + + return totalSequence; +} + +// Reads a charmap string. +int StringParser::ParseString(long srcPos, unsigned char* dest, int& destLength) +{ + m_pos = srcPos; + + if (m_buffer[m_pos] != '"') + RaiseError("expected UTF-8 string literal"); + + long start = m_pos; + + m_pos++; + + destLength = 0; + + while (m_buffer[m_pos] != '"') + { + std::string sequence = (m_buffer[m_pos] == '{') ? ReadBracketedConstants() : ReadCharOrEscape(); + + for (const char& c : sequence) + { + if (destLength == kMaxStringLength) + RaiseError("mapped string longer than %d bytes", destLength); + + dest[destLength++] = c; + } + } + + m_pos++; // Go past the right quote. + + return m_pos - start; +} + +void StringParser::RaiseError(const char* format, ...) +{ + const int bufferSize = 1024; + char buffer[bufferSize]; + + std::va_list args; + va_start(args, format); + std::vsnprintf(buffer, bufferSize, format, args); + va_end(args); + + throw std::runtime_error(buffer); +} + +// Converts digit character to numerical value. +static int ConvertDigit(char c, int radix) +{ + int digit; + + if (c >= '0' && c <= '9') + digit = c - '0'; + else if (c >= 'A' && c <= 'F') + digit = 10 + c - 'A'; + else if (c >= 'a' && c <= 'f') + digit = 10 + c - 'a'; + else + return -1; + + return (digit < radix) ? digit : -1; +} + +void StringParser::SkipRestOfInteger(int radix) +{ + while (ConvertDigit(m_buffer[m_pos], radix) != -1) + m_pos++; +} + +StringParser::Integer StringParser::ReadDecimal() +{ + const int radix = 10; + std::uint64_t n = 0; + int digit; + std::uint64_t max = UINT32_MAX; + long startPos = m_pos; + + while ((digit = ConvertDigit(m_buffer[m_pos], radix)) != -1) + { + n = n * radix + digit; + + if (n >= max) + { + SkipRestOfInteger(radix); + + std::string intLiteral(m_buffer + startPos, m_pos - startPos); + RaiseError("integer literal \"%s\" is too large", intLiteral.c_str()); + } + + m_pos++; + } + + int size; + + if (m_buffer[m_pos] == 'H') + { + if (n >= 0x10000) + { + RaiseError("%lu is too large to be a halfword", (unsigned long)n); + } + + size = 2; + m_pos++; + } + else if (m_buffer[m_pos] == 'W') + { + size = 4; + m_pos++; + } + else + { + if (n >= 0x10000) + size = 4; + else if (n >= 0x100) + size = 2; + else + size = 1; + } + + return{ static_cast<std::uint32_t>(n), size }; +} + +StringParser::Integer StringParser::ReadHex() +{ + const int radix = 16; + std::uint64_t n = 0; + int digit; + std::uint64_t max = UINT32_MAX; + long startPos = m_pos; + + while ((digit = ConvertDigit(m_buffer[m_pos], radix)) != -1) + { + n = n * radix + digit; + + if (n >= max) + { + SkipRestOfInteger(radix); + + std::string intLiteral(m_buffer + startPos, m_pos - startPos); + RaiseError("integer literal \"%s\" is too large", intLiteral.c_str()); + } + + m_pos++; + } + + int length = m_pos - startPos; + int size = 0; + + switch (length) + { + case 2: + size = 1; + break; + case 4: + size = 2; + break; + case 8: + size = 4; + break; + default: + { + std::string intLiteral(m_buffer + startPos, m_pos - startPos); + RaiseError("hex integer literal \"0x%s\" doesn't have length of 2, 4, or 8 digits", intLiteral.c_str()); + } + } + + return{ static_cast<std::uint32_t>(n), size }; +} + +StringParser::Integer StringParser::ReadInteger() +{ + if (!IsAsciiDigit(m_buffer[m_pos])) + RaiseError("expected integer"); + + if (m_buffer[m_pos] == '0' && m_buffer[m_pos + 1] == 'x') + { + m_pos += 2; + return ReadHex(); + } + + return ReadDecimal(); +} + +// Skips tabs and spaces. +void StringParser::SkipWhitespace() +{ + while (m_buffer[m_pos] == '\t' || m_buffer[m_pos] == ' ') + m_pos++; +} diff --git a/tools/preproc/string_parser.h b/tools/preproc/string_parser.h new file mode 100644 index 000000000..abd2bfe9a --- /dev/null +++ b/tools/preproc/string_parser.h @@ -0,0 +1,55 @@ +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#ifndef STRING_PARSER_H +#define STRING_PARSER_H + +#include <cstdint> +#include <string> +#include "preproc.h" + +class StringParser +{ +public: + StringParser(char* buffer, long size) : m_buffer(buffer), m_size(size), m_pos(0) {} + int ParseString(long srcPos, unsigned char* dest, int &destLength); + +private: + struct Integer + { + std::uint32_t value; + int size; + }; + + char* m_buffer; + long m_size; + long m_pos; + + Integer ReadInteger(); + Integer ReadDecimal(); + Integer ReadHex(); + std::string ReadCharOrEscape(); + std::string ReadBracketedConstants(); + void SkipWhitespace(); + void SkipRestOfInteger(int radix); + void RaiseError(const char* format, ...); +}; + +#endif // STRING_PARSER_H |