Fixed merge conflict

2026-08-22 06:44:46 -04:00 · 2020-04-02 09:40:01 -07:00
parent 2a1bf81765 999044cdcd
commit c218f38635
16 changed files with 194 additions and 616 deletions
@@ -1,23 +0,0 @@
-.include "macro.inc"
-
- # assembler directives
- .set noat      # allow manual use of $at
- .set noreorder # don't insert nops after branches
- .set gp=64     # allow use of 64-bit general purposee registers
-
-.section .data
-
-glabel Obj_Comb_InitVars
- .word 0x019E0600, 0x00000000, 0x00020000, 0x000001B4
-.word ObjComb_Init
-.word ObjComb_Destroy
-.word ObjComb_Update
-.word ObjComb_Draw
-glabel D_80B922E0
- .word 0x00000000, 0x00000000, 0x00000000, 0x4001FFFE, 0x00000000, 0x00010100, 0x00000000, 0x00000000, 0x000F0064
-glabel D_80B92304
- .word 0x0A000909, 0x20000000, 0x00000001
-.word D_80B922E0
-glabel D_80B92314
- .word 0xC8500064, 0xB0F4044C, 0xB0F80064, 0x30FC0384, 0x00000000, 0x00000000, 0x00000000
-
@@ -1,11 +0,0 @@
-.include "macro.inc"
-
- # assembler directives
- .set noat      # allow manual use of $at
- .set noreorder # don't insert nops after branches
- .set gp=64     # allow use of 64-bit general purposee registers
-
-.section .rodata
-glabel D_80B92380
-
-.incbin "baserom/ovl_Obj_Comb", 0x820, 0x000000A0
@@ -1,37 +0,0 @@
-.include "macro.inc"
-
- # assembler directives
- .set noat      # allow manual use of $at
- .set noreorder # don't insert nops after branches
- .set gp=64     # allow use of 64-bit general purposee registers
-
-.section .rodata
-
-glabel D_80B92330
-    .asciz "../z_obj_comb.c"
-    .balign 4
-
-glabel D_80B92340
-    .asciz "../z_obj_comb.c"
-    .balign 4
-
-glabel D_80B92350
-    .asciz "../z_obj_comb.c"
-    .balign 4
-
-glabel D_80B92360
- .word 0x3F19999A
-glabel D_80B92364
- .word 0x3F333333
-glabel D_80B92368
- .word 0x3DCCCCCD
-glabel D_80B9236C
- .word 0x3F4CCCCD
-glabel D_80B92370
- .word 0x38C90FDB
-glabel D_80B92374
- .word 0x38C90FDB
-glabel D_80B92378
- .word 0x38C90FDB, 0x00000000
-
-