This commit is contained in:
farisawan-2000 2020-11-03 12:11:12 -05:00
parent 63ba8ffe89
commit 11b9791d52
8 changed files with 477 additions and 164 deletions

View File

@ -2,238 +2,296 @@
.section .data
.balign 2
glabel bank_0_index_1_geo # 0x4AA8F0
glabel bank_0_index_1_geo_start # 0x4AA8F0
.incbin "assets/geo/bank_0/1/block.bin"
glabel bank_0_index_1_geo_end
.balign 2
glabel bank_0_index_2_geo # 0x4AB360
glabel bank_0_index_2_geo_start # 0x4AB360
.incbin "assets/geo/bank_0/2/block.bin"
glabel bank_0_index_2_geo_end
.balign 2
glabel bank_0_index_3_geo # 0x4ABED0
glabel bank_0_index_3_geo_start # 0x4ABED0
.incbin "assets/geo/bank_0/3/block.bin"
glabel bank_0_index_3_geo_end
.balign 2
glabel bank_0_index_4_geo # 0x4ACD30
glabel bank_0_index_4_geo_start # 0x4ACD30
.incbin "assets/geo/bank_0/4/block.bin"
glabel bank_0_index_4_geo_end
.balign 2
glabel bank_0_index_5_geo # 0x4AFE80
glabel bank_0_index_5_geo_start # 0x4AFE80
.incbin "assets/geo/bank_0/5/block.bin"
glabel bank_0_index_5_geo_end
.balign 2
glabel bank_0_index_6_geo # 0x4B0750
glabel bank_0_index_6_geo_start # 0x4B0750
.incbin "assets/geo/bank_0/6/block.bin"
glabel bank_0_index_6_geo_end
.balign 2
glabel bank_0_index_7_geo # 0x4B14E0
glabel bank_0_index_7_geo_start # 0x4B14E0
.incbin "assets/geo/bank_0/7/block.bin"
glabel bank_0_index_7_geo_end
.balign 2
glabel bank_0_index_8_geo # 0x4B1BB0
glabel bank_0_index_8_geo_start # 0x4B1BB0
.incbin "assets/geo/bank_0/8/block.bin"
glabel bank_0_index_8_geo_end
.balign 2
glabel bank_0_index_9_geo # 0x4B2280
glabel bank_0_index_9_geo_start # 0x4B2280
.incbin "assets/geo/bank_0/9/block.bin"
glabel bank_0_index_9_geo_end
.balign 2
glabel bank_0_index_10_geo # 0x4B2A70
glabel bank_0_index_10_geo_start # 0x4B2A70
.incbin "assets/geo/bank_0/10/block.bin"
glabel bank_0_index_10_geo_end
.balign 2
glabel bank_0_index_1_image # 0x4B3260
glabel bank_0_index_1_image_start # 0x4B3260
.incbin "assets/image/bank_0/1/block.bin"
glabel bank_0_index_1_image_end
.balign 2
glabel bank_0_index_2_image # 0x4B3270
glabel bank_0_index_2_image_start # 0x4B3270
.incbin "assets/image/bank_0/2/block.bin"
glabel bank_0_index_2_image_end
.balign 2
glabel bank_0_index_3_image # 0x4B3470
glabel bank_0_index_3_image_start # 0x4B3470
.incbin "assets/image/bank_0/3/block.bin"
glabel bank_0_index_3_image_end
.balign 2
glabel bank_0_index_4_image # 0x4B3670
glabel bank_0_index_4_image_start # 0x4B3670
.incbin "assets/image/bank_0/4/block.bin"
glabel bank_0_index_4_image_end
.balign 2
glabel bank_0_index_5_image # 0x4B3870
glabel bank_0_index_5_image_start # 0x4B3870
.incbin "assets/image/bank_0/5/block.bin"
glabel bank_0_index_5_image_end
.balign 2
glabel bank_0_index_6_image # 0x4B3A70
glabel bank_0_index_6_image_start # 0x4B3A70
.incbin "assets/image/bank_0/6/block.bin"
glabel bank_0_index_6_image_end
.balign 2
glabel bank_0_index_7_image # 0x4B3C70
glabel bank_0_index_7_image_start # 0x4B3C70
.incbin "assets/image/bank_0/7/block.bin"
glabel bank_0_index_7_image_end
.balign 2
glabel bank_0_index_8_image # 0x4B3E70
glabel bank_0_index_8_image_start # 0x4B3E70
.incbin "assets/image/bank_0/8/block.bin"
glabel bank_0_index_8_image_end
.balign 2
glabel bank_0_index_9_image # 0x4B4070
glabel bank_0_index_9_image_start # 0x4B4070
.incbin "assets/image/bank_0/9/block.bin"
glabel bank_0_index_9_image_end
.balign 2
glabel bank_0_index_10_image # 0x4B4270
glabel bank_0_index_10_image_start # 0x4B4270
.incbin "assets/image/bank_0/10/block.bin"
glabel bank_0_index_10_image_end
.balign 2
glabel bank_0_index_11_image # 0x4B4470
glabel bank_0_index_11_image_start # 0x4B4470
.incbin "assets/image/bank_0/11/block.bin"
glabel bank_0_index_11_image_end
.balign 2
glabel bank_0_index_12_image # 0x4B4670
glabel bank_0_index_12_image_start # 0x4B4670
.incbin "assets/image/bank_0/12/block.bin"
glabel bank_0_index_12_image_end
.balign 2
glabel bank_0_index_13_image # 0x4B4E70
glabel bank_0_index_13_image_start # 0x4B4E70
.incbin "assets/image/bank_0/13/block.bin"
glabel bank_0_index_13_image_end
.balign 2
glabel bank_0_index_14_image # 0x4B5E70
glabel bank_0_index_14_image_start # 0x4B5E70
.incbin "assets/image/bank_0/14/block.bin"
glabel bank_0_index_14_image_end
.balign 2
glabel bank_0_index_15_image # 0x4B6070
glabel bank_0_index_15_image_start # 0x4B6070
.incbin "assets/image/bank_0/15/block.bin"
glabel bank_0_index_15_image_end
.balign 2
glabel bank_0_index_16_image # 0x4B6270
glabel bank_0_index_16_image_start # 0x4B6270
.incbin "assets/image/bank_0/16/block.bin"
glabel bank_0_index_16_image_end
.balign 2
glabel bank_0_index_17_image # 0x4B6470
glabel bank_0_index_17_image_start # 0x4B6470
.incbin "assets/image/bank_0/17/block.bin"
glabel bank_0_index_17_image_end
.balign 2
glabel bank_0_index_18_image # 0x4B6670
glabel bank_0_index_18_image_start # 0x4B6670
.incbin "assets/image/bank_0/18/block.bin"
glabel bank_0_index_18_image_end
.balign 2
glabel bank_0_index_19_image # 0x4B6870
glabel bank_0_index_19_image_start # 0x4B6870
.incbin "assets/image/bank_0/19/block.bin"
glabel bank_0_index_19_image_end
.balign 2
glabel bank_0_index_20_image # 0x4B6A70
glabel bank_0_index_20_image_start # 0x4B6A70
.incbin "assets/image/bank_0/20/block.bin"
glabel bank_0_index_20_image_end
.balign 2
glabel bank_0_index_21_image # 0x4B6AF0
glabel bank_0_index_21_image_start # 0x4B6AF0
.incbin "assets/image/bank_0/21/block.bin"
glabel bank_0_index_21_image_end
.balign 2
glabel bank_0_index_22_image # 0x4B6B70
glabel bank_0_index_22_image_start # 0x4B6B70
.incbin "assets/image/bank_0/22/block.bin"
glabel bank_0_index_22_image_end
.balign 2
glabel bank_0_index_23_image # 0x4B6D70
glabel bank_0_index_23_image_start # 0x4B6D70
.incbin "assets/image/bank_0/23/block.bin"
glabel bank_0_index_23_image_end
.balign 2
glabel bank_0_index_24_image # 0x4C9B80
glabel bank_0_index_24_image_start # 0x4C9B80
.incbin "assets/image/bank_0/24/block.bin"
glabel bank_0_index_24_image_end
.balign 2
glabel bank_0_index_25_image # 0x4DC990
glabel bank_0_index_25_image_start # 0x4DC990
.incbin "assets/image/bank_0/25/block.bin"
glabel bank_0_index_25_image_end
.balign 2
glabel bank_0_index_26_image # 0x4ED0E0
glabel bank_0_index_26_image_start # 0x4ED0E0
.incbin "assets/image/bank_0/26/block.bin"
glabel bank_0_index_26_image_end
.balign 2
glabel bank_0_index_27_image # 0x4EF0F0
glabel bank_0_index_27_image_start # 0x4EF0F0
.incbin "assets/image/bank_0/27/block.bin"
glabel bank_0_index_27_image_end
.balign 2
glabel bank_0_index_1_anim # 0x4F01B0
glabel bank_0_index_1_anim_start # 0x4F01B0
.incbin "assets/anim/bank_0/1/block.bin"
glabel bank_0_index_1_anim_end
.balign 2
glabel bank_0_index_2_anim # 0x4F030C
glabel bank_0_index_2_anim_start # 0x4F030C
.incbin "assets/anim/bank_0/2/block.bin"
glabel bank_0_index_2_anim_end
.balign 2
glabel bank_0_index_3_anim # 0x4F04C4
glabel bank_0_index_3_anim_start # 0x4F04C4
.incbin "assets/anim/bank_0/3/block.bin"
glabel bank_0_index_3_anim_end
.balign 2
glabel bank_0_index_4_anim # 0x4F054C
glabel bank_0_index_4_anim_start # 0x4F054C
.incbin "assets/anim/bank_0/4/block.bin"
glabel bank_0_index_4_anim_end
.balign 2
glabel bank_0_index_5_anim # 0x4F09E4
glabel bank_0_index_5_anim_start # 0x4F09E4
.incbin "assets/anim/bank_0/5/block.bin"
glabel bank_0_index_5_anim_end
.balign 2
glabel bank_0_index_6_anim # 0x4F0DA0
glabel bank_0_index_6_anim_start # 0x4F0DA0
.incbin "assets/anim/bank_0/6/block.bin"
glabel bank_0_index_6_anim_end
.balign 2
glabel bank_0_index_7_anim # 0x4F0F80
glabel bank_0_index_7_anim_start # 0x4F0F80
.incbin "assets/anim/bank_0/7/block.bin"
glabel bank_0_index_7_anim_end
.balign 2
glabel bank_0_index_8_anim # 0x4F15E4
glabel bank_0_index_8_anim_start # 0x4F15E4
.incbin "assets/anim/bank_0/8/block.bin"
glabel bank_0_index_8_anim_end
.balign 2
glabel bank_0_index_9_anim # 0x4F2350
glabel bank_0_index_9_anim_start # 0x4F2350
.incbin "assets/anim/bank_0/9/block.bin"
glabel bank_0_index_9_anim_end
.balign 2
glabel bank_0_index_10_anim # 0x4F2474
glabel bank_0_index_10_anim_start # 0x4F2474
.incbin "assets/anim/bank_0/10/block.bin"
glabel bank_0_index_10_anim_end
.balign 2
glabel bank_0_index_11_anim # 0x4F25A8
glabel bank_0_index_11_anim_start # 0x4F25A8
.incbin "assets/anim/bank_0/11/block.bin"
glabel bank_0_index_11_anim_end
.balign 2
glabel bank_0_index_12_anim # 0x4F26CC
glabel bank_0_index_12_anim_start # 0x4F26CC
.incbin "assets/anim/bank_0/12/block.bin"
glabel bank_0_index_12_anim_end
.balign 2
glabel bank_0_index_13_anim # 0x4F283C
glabel bank_0_index_13_anim_start # 0x4F283C
.incbin "assets/anim/bank_0/13/block.bin"
glabel bank_0_index_13_anim_end
.balign 2
glabel bank_0_index_14_anim # 0x4F2A00
glabel bank_0_index_14_anim_start # 0x4F2A00
.incbin "assets/anim/bank_0/14/block.bin"
glabel bank_0_index_14_anim_end
.balign 2
glabel bank_0_index_15_anim # 0x4F2B70
glabel bank_0_index_15_anim_start # 0x4F2B70
.incbin "assets/anim/bank_0/15/block.bin"
glabel bank_0_index_15_anim_end
.balign 2
glabel bank_0_index_16_anim # 0x4F2E98
glabel bank_0_index_16_anim_start # 0x4F2E98
.incbin "assets/anim/bank_0/16/block.bin"
glabel bank_0_index_16_anim_end
.balign 2
glabel bank_0_index_17_anim # 0x4F3160
glabel bank_0_index_17_anim_start # 0x4F3160
.incbin "assets/anim/bank_0/17/block.bin"
glabel bank_0_index_17_anim_end
.balign 2
glabel bank_0_index_18_anim # 0x4F31F4
glabel bank_0_index_18_anim_start # 0x4F31F4
.incbin "assets/anim/bank_0/18/block.bin"
glabel bank_0_index_18_anim_end
.balign 2
glabel bank_0_index_1_misc # 0x4F3290
glabel bank_0_index_1_misc_start # 0x4F3290
.incbin "assets/misc/bank_0/1/block.bin"
glabel bank_0_index_1_misc_end
.balign 2
glabel bank_0_index_2_misc # 0x4F52DC
glabel bank_0_index_2_misc_start # 0x4F52DC
.incbin "assets/misc/bank_0/2/block.bin"
glabel bank_0_index_2_misc_end
.balign 2
glabel bank_0_index_3_misc # 0x4FB87C
glabel bank_0_index_3_misc_start # 0x4FB87C
.incbin "assets/misc/bank_0/3/block.bin"
glabel bank_0_index_3_misc_end
.balign 2
glabel bank_0_index_4_misc # 0x4FB974
glabel bank_0_index_4_misc_start # 0x4FB974
.incbin "assets/misc/bank_0/4/block.bin"
glabel bank_0_index_4_misc_end

View File

@ -5,26 +5,26 @@
u32 *D_800C46A0[] = {
NULL,
NULL,
bank_0_index_1_geo,
bank_0_index_2_geo,
bank_0_index_2_geo,
bank_0_index_3_geo,
bank_0_index_3_geo,
bank_0_index_4_geo,
bank_0_index_4_geo,
bank_0_index_5_geo,
bank_0_index_5_geo,
bank_0_index_6_geo,
bank_0_index_6_geo,
bank_0_index_7_geo,
bank_0_index_7_geo,
bank_0_index_8_geo,
bank_0_index_8_geo,
bank_0_index_9_geo,
bank_0_index_9_geo,
bank_0_index_10_geo,
bank_0_index_10_geo,
bank_0_index_1_image,
bank_0_index_1_geo_start,
bank_0_index_1_geo_end,
bank_0_index_2_geo_start,
bank_0_index_2_geo_end,
bank_0_index_3_geo_start,
bank_0_index_3_geo_end,
bank_0_index_4_geo_start,
bank_0_index_4_geo_end,
bank_0_index_5_geo_start,
bank_0_index_5_geo_end,
bank_0_index_6_geo_start,
bank_0_index_6_geo_end,
bank_0_index_7_geo_start,
bank_0_index_7_geo_end,
bank_0_index_8_geo_start,
bank_0_index_8_geo_end,
bank_0_index_9_geo_start,
bank_0_index_9_geo_end,
bank_0_index_10_geo_start,
bank_0_index_10_geo_end,
};
u32 D_800C46F8 = 0x00000000;
@ -145,13 +145,13 @@ u32 D_800C47D8 = 0xFFFFFFFF;
u32 *D_800C47DC = &D_800C46F8;
u32 *D_800C47E0 = bank_0_index_1_image;
u32 *D_800C47E0 = bank_0_index_1_image_start;
u32 *D_800C47E4 = &D_800C476C;
u32 *D_800C47E8 = bank_0_index_1_anim;
u32 *D_800C47E8 = bank_0_index_1_anim_start;
u32 *D_800C47EC = &D_800C47BC;
u32 *D_800C47F0 = bank_0_index_1_misc;
u32 *D_800C47F0 = bank_0_index_1_misc_start;

227
data/banks/bank0.s Normal file
View File

@ -0,0 +1,227 @@
.include "include/macros.inc"
.section .data
glabel D_800C46A0
.word NULL
.word NULL
.word bank_0_index_1_geo_start
.word bank_0_index_1_geo_end
.word bank_0_index_2_geo_start
.word bank_0_index_2_geo_end
.word bank_0_index_3_geo_start
.word bank_0_index_3_geo_end
.word bank_0_index_4_geo_start
.word bank_0_index_4_geo_end
.word bank_0_index_5_geo_start
.word bank_0_index_5_geo_end
.word bank_0_index_6_geo_start
.word bank_0_index_6_geo_end
.word bank_0_index_7_geo_start
.word bank_0_index_7_geo_end
.word bank_0_index_8_geo_start
.word bank_0_index_8_geo_end
.word bank_0_index_9_geo_start
.word bank_0_index_9_geo_end
.word bank_0_index_10_geo_start
.word bank_0_index_10_geo_end
glabel D_800C46F8
.word 0x00000000
glabel D_800C46FC
.word 0x00000000
glabel D_800C4700
.word 0x00000010
glabel D_800C4704
.word 0x00000210
glabel D_800C4708
.word 0x00000410
glabel D_800C470C
.word 0x00000610
glabel D_800C4710
.word 0x00000810
glabel D_800C4714
.word 0x00000A10
glabel D_800C4718
.word 0x00000C10
glabel D_800C471C
.word 0x00000E10
glabel D_800C4720
.word 0x00001010
glabel D_800C4724
.word 0x00001210
glabel D_800C4728
.word 0x00001410
glabel D_800C472C
.word 0x00001C10
glabel D_800C4730
.word 0x00002C10
glabel D_800C4734
.word 0x00002E10
glabel D_800C4738
.word 0x00003010
glabel D_800C473C
.word 0x00003210
glabel D_800C4740
.word 0x00003410
glabel D_800C4744
.word 0x00003610
glabel D_800C4748
.word 0x00003810
glabel D_800C474C
.word 0x00003890
glabel D_800C4750
.word 0x00003910
glabel D_800C4754
.word 0x00003B10
glabel D_800C4758
.word 0x00016920
glabel D_800C475C
.word 0x00029730
glabel D_800C4760
.word 0x00039E80
glabel D_800C4764
.word 0x0003BE90
glabel D_800C4768
.word 0x0003CF40
glabel D_800C476C
.word 0x00000000
glabel D_800C4770
.word 0x00000000
glabel D_800C4774
.word 0x0000015C
glabel D_800C4778
.word 0x00000314
glabel D_800C477C
.word 0x0000039C
glabel D_800C4780
.word 0x00000834
glabel D_800C4784
.word 0x00000BF0
glabel D_800C4788
.word 0x00000DD0
glabel D_800C478C
.word 0x00001434
glabel D_800C4790
.word 0x000021A0
glabel D_800C4794
.word 0x000022C4
glabel D_800C4798
.word 0x000023F8
glabel D_800C479C
.word 0x0000251C
glabel D_800C47A0
.word 0x0000268C
glabel D_800C47A4
.word 0x00002850
glabel D_800C47A8
.word 0x000029C0
glabel D_800C47AC
.word 0x00002CE8
glabel D_800C47B0
.word 0x00002FB0
glabel D_800C47B4
.word 0x00003044
glabel D_800C47B8
.word 0x000030DC
glabel D_800C47BC
.word 0x00000000
glabel D_800C47C0
.word 0x00000000
glabel D_800C47C4
.word 0x0000204C
glabel D_800C47C8
.word 0x000085EC
glabel D_800C47CC
.word 0x000086E4
glabel D_800C47D0
.word 0x0000970C
glabel *D_800C47D4
.word D_800C46A0
glabel D_800C47D8
.word -1
glabel *D_800C47DC
.word D_800C46F8
glabel *D_800C47E0
.word bank_0_index_1_image
glabel *D_800C47E4
.word D_800C476C
glabel *D_800C47E8
.word bank_0_index_1_anim
glabel *D_800C47EC
.word D_800C47BC
glabel *D_800C47F0
.word bank_0_index_1_misc

View File

@ -17,65 +17,80 @@ struct BankHeader {
extern u32 bank_0_index_1_geo[];
extern u32 bank_0_index_2_geo[];
extern u32 bank_0_index_3_geo[];
extern u32 bank_0_index_4_geo[];
extern u32 bank_0_index_5_geo[];
extern u32 bank_0_index_6_geo[];
extern u32 bank_0_index_7_geo[];
extern u32 bank_0_index_8_geo[];
extern u32 bank_0_index_9_geo[];
extern u32 bank_0_index_10_geo[];
extern u32 bank_0_index_1_image[];
extern u32 bank_0_index_2_image[];
extern u32 bank_0_index_3_image[];
extern u32 bank_0_index_4_image[];
extern u32 bank_0_index_5_image[];
extern u32 bank_0_index_6_image[];
extern u32 bank_0_index_7_image[];
extern u32 bank_0_index_8_image[];
extern u32 bank_0_index_9_image[];
extern u32 bank_0_index_10_image[];
extern u32 bank_0_index_11_image[];
extern u32 bank_0_index_12_image[];
extern u32 bank_0_index_13_image[];
extern u32 bank_0_index_14_image[];
extern u32 bank_0_index_15_image[];
extern u32 bank_0_index_16_image[];
extern u32 bank_0_index_17_image[];
extern u32 bank_0_index_18_image[];
extern u32 bank_0_index_19_image[];
extern u32 bank_0_index_20_image[];
extern u32 bank_0_index_21_image[];
extern u32 bank_0_index_22_image[];
extern u32 bank_0_index_23_image[];
extern u32 bank_0_index_24_image[];
extern u32 bank_0_index_25_image[];
extern u32 bank_0_index_26_image[];
extern u32 bank_0_index_27_image[];
extern u32 bank_0_index_1_anim[];
extern u32 bank_0_index_2_anim[];
extern u32 bank_0_index_3_anim[];
extern u32 bank_0_index_4_anim[];
extern u32 bank_0_index_5_anim[];
extern u32 bank_0_index_6_anim[];
extern u32 bank_0_index_7_anim[];
extern u32 bank_0_index_8_anim[];
extern u32 bank_0_index_9_anim[];
extern u32 bank_0_index_10_anim[];
extern u32 bank_0_index_11_anim[];
extern u32 bank_0_index_12_anim[];
extern u32 bank_0_index_13_anim[];
extern u32 bank_0_index_14_anim[];
extern u32 bank_0_index_15_anim[];
extern u32 bank_0_index_16_anim[];
extern u32 bank_0_index_17_anim[];
extern u32 bank_0_index_18_anim[];
extern u32 bank_0_index_1_misc[];
extern u32 bank_0_index_2_misc[];
extern u32 bank_0_index_3_misc[];
extern u32 bank_0_index_4_misc[];
extern u32 bank_0_index_1_geo_start[];
extern u32 bank_0_index_2_geo_start[];
extern u32 bank_0_index_3_geo_start[];
extern u32 bank_0_index_4_geo_start[];
extern u32 bank_0_index_5_geo_start[];
extern u32 bank_0_index_6_geo_start[];
extern u32 bank_0_index_7_geo_start[];
extern u32 bank_0_index_8_geo_start[];
extern u32 bank_0_index_9_geo_start[];
extern u32 bank_0_index_10_geo_start[];
extern u32 bank_0_index_1_geo_end[];
extern u32 bank_0_index_2_geo_end[];
extern u32 bank_0_index_3_geo_end[];
extern u32 bank_0_index_4_geo_end[];
extern u32 bank_0_index_5_geo_end[];
extern u32 bank_0_index_6_geo_end[];
extern u32 bank_0_index_7_geo_end[];
extern u32 bank_0_index_8_geo_end[];
extern u32 bank_0_index_9_geo_end[];
extern u32 bank_0_index_10_geo_end[];
extern u32 bank_0_index_1_image_start[];
extern u32 bank_0_index_2_image_start[];
extern u32 bank_0_index_3_image_start[];
extern u32 bank_0_index_4_image_start[];
extern u32 bank_0_index_5_image_start[];
extern u32 bank_0_index_6_image_start[];
extern u32 bank_0_index_7_image_start[];
extern u32 bank_0_index_8_image_start[];
extern u32 bank_0_index_9_image_start[];
extern u32 bank_0_index_10_image_start[];
extern u32 bank_0_index_11_image_start[];
extern u32 bank_0_index_12_image_start[];
extern u32 bank_0_index_13_image_start[];
extern u32 bank_0_index_14_image_start[];
extern u32 bank_0_index_15_image_start[];
extern u32 bank_0_index_16_image_start[];
extern u32 bank_0_index_17_image_start[];
extern u32 bank_0_index_18_image_start[];
extern u32 bank_0_index_19_image_start[];
extern u32 bank_0_index_20_image_start[];
extern u32 bank_0_index_21_image_start[];
extern u32 bank_0_index_22_image_start[];
extern u32 bank_0_index_23_image_start[];
extern u32 bank_0_index_24_image_start[];
extern u32 bank_0_index_25_image_start[];
extern u32 bank_0_index_26_image_start[];
extern u32 bank_0_index_27_image_start[];
extern u32 bank_0_index_1_anim_start[];
extern u32 bank_0_index_2_anim_start[];
extern u32 bank_0_index_3_anim_start[];
extern u32 bank_0_index_4_anim_start[];
extern u32 bank_0_index_5_anim_start[];
extern u32 bank_0_index_6_anim_start[];
extern u32 bank_0_index_7_anim_start[];
extern u32 bank_0_index_8_anim_start[];
extern u32 bank_0_index_9_anim_start[];
extern u32 bank_0_index_10_anim_start[];
extern u32 bank_0_index_11_anim_start[];
extern u32 bank_0_index_12_anim_start[];
extern u32 bank_0_index_13_anim_start[];
extern u32 bank_0_index_14_anim_start[];
extern u32 bank_0_index_15_anim_start[];
extern u32 bank_0_index_16_anim_start[];
extern u32 bank_0_index_17_anim_start[];
extern u32 bank_0_index_18_anim_start[];
extern u32 bank_0_index_1_misc_start[];
extern u32 bank_0_index_2_misc_start[];
extern u32 bank_0_index_3_misc_start[];
extern u32 bank_0_index_4_misc_start[];
extern u32 bank_1_index_1_geo[];
extern u32 bank_1_index_2_geo[];
extern u32 bank_1_index_3_geo[];

View File

@ -19,9 +19,20 @@
.byte \r, \g, \b, \a
.endm
# MK64 texture entry
.macro mk_texture type, address, width=0, height=0, dX=0, dY=0, size=0
.hword \type, 0x0000
.word \address
.hword \width, \height, \dX, \dY, \size, 0x0000
# Kirby 64 helper macros
.macro NULL
0
.endm
.macro image_offset bank, index
.word (bank_\bank\()_index_\index\()_image_start - bank_\bank\()_index_0_image_start)
.endm
.macro anim_offset bank, index
.word 0
.endm
.macro misc_offset bank, index
.word 0
.endm

@ -1 +1 @@
Subproject commit c847ea657151ff3a55a717244d936a2060b738c2
Subproject commit 1cb7a565f1dbaa70e9c48a503209ba6bde15e91e

View File

@ -5,23 +5,23 @@
#ifdef MIPS_TO_C
// Almost matched (need to load arg0 into v0)
u32 func_8000BE90(struct unk8000BE90Func *arg0)
{
u32 func_8000BE90(struct unk8000BE90Func *arg0) {
if (arg0->unk10) {
return arg0->unk10;
} else if (arg0->unk8) {
}
if (arg0->unk8) {
return arg0->unk8;
} else {
for (;;) {
if (arg0->unk14 == ((void *) 1)) {
return 0;
}
if (arg0->unk14->unk8) {
return arg0->unk14->unk8;
}
arg0 = arg0->unk14;
}
for (;;) {
if (arg0->unk14 == ((void *) 1)) {
return 0;
}
} return arg0->unk14;
if (arg0->unk14->unk8) {
return arg0->unk14->unk8;
}
arg0 = arg0->unk14;
}
return arg0->unk14;
}
#else
GLOBAL_ASM("asm/non_matchings/ovl0/ovl0_3/func_8000BE90.s")

View File

@ -130,8 +130,9 @@ s32 func_80019E5C(f32 arg0) {
u16 temp_v1;
temp_f16 = (arg0 + D_80040C74) * D_80040C78;
temp_v1 = *(&D_8003E330 + ((temp_f16 & 0x7FF) * 2));
if ((temp_f16 & 0x800) != 0) {
// u16 array
temp_v1 = D_8003E330[temp_f16 & 0x7FF];
if (temp_f16 & 0x800) {
return -temp_v1;
}
return temp_v1;
@ -1768,7 +1769,8 @@ void create_y_rotation_matrix(Mat4 arg0, f32 angle)
// TODO: If the order of setting the matrix values makes sense,
// and persists across functions,
// and it matches with this macro
// edit and incorporate MAT4_SET into this function
// edit and incorporate MAT4_SET into this function.
// Otherwise, leave this in as a documentation comment
// MAT4_SET(arg0,
// cosAngle, 0.0f, -sinAngle, 0.0f,
// 0.0f, 1.0f, 0.0f, 0.0f,