Merge pull request #114 from gamemasterplc/main

Label item code
This commit is contained in:
gamemasterplc 2024-01-16 22:02:37 -06:00 committed by GitHub
commit 7044dc2bd4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 79 additions and 63 deletions

View file

@ -1669,46 +1669,46 @@ CreateCoinMdl = .text:0x8008EABC; // type:function size:0x94 scope:local
KillCoinMdl = .text:0x8008EB50; // type:function size:0x9C scope:local KillCoinMdl = .text:0x8008EB50; // type:function size:0x9C scope:local
PopupCoin = .text:0x8008EBEC; // type:function size:0x10C scope:local PopupCoin = .text:0x8008EBEC; // type:function size:0x10C scope:local
PopupCoinExec = .text:0x8008ECF8; // type:function size:0x130 scope:local PopupCoinExec = .text:0x8008ECF8; // type:function size:0x130 scope:local
fn_8008EE28 = .text:0x8008EE28; // type:function size:0x74 BoardItemStart = .text:0x8008EE28; // type:function size:0x74
fn_8008EE9C = .text:0x8008EE9C; // type:function size:0x1C BoardItemDoneCheck = .text:0x8008EE9C; // type:function size:0x1C
fn_8008EEB8 = .text:0x8008EEB8; // type:function size:0x6C BoardItemPlayerRestore = .text:0x8008EEB8; // type:function size:0x6C
fn_8008EF24 = .text:0x8008EF24; // type:function size:0x64 ItemProcess = .text:0x8008EF24; // type:function size:0x64 scope:local
fn_8008EF88 = .text:0x8008EF88; // type:function size:0x64 RestoreProcess = .text:0x8008EF88; // type:function size:0x64 scope:local
fn_8008EFEC = .text:0x8008EFEC; // type:function size:0xC ItemDestroy = .text:0x8008EFEC; // type:function size:0xC scope:local
fn_8008EFF8 = .text:0x8008EFF8; // type:function size:0xC RestoreDestroy = .text:0x8008EFF8; // type:function size:0xC scope:local
fn_8008F004 = .text:0x8008F004; // type:function size:0x180 ItemSizeShowAnim = .text:0x8008F004; // type:function size:0x180 scope:local
fn_8008F184 = .text:0x8008F184; // type:function size:0x1BC ItemRotProc = .text:0x8008F184; // type:function size:0x1BC scope:local
fn_8008F340 = .text:0x8008F340; // type:function size:0x220 ItemShowProc = .text:0x8008F340; // type:function size:0x220 scope:local
fn_8008F560 = .text:0x8008F560; // type:function size:0x374 ItemGetTarget = .text:0x8008F560; // type:function size:0x374 scope:local
fn_8008F8D4 = .text:0x8008F8D4; // type:function size:0x204 ItemSizeSet = .text:0x8008F8D4; // type:function size:0x204 scope:local
fn_8008FAD8 = .text:0x8008FAD8; // type:function size:0xA4 ExecItemMini = .text:0x8008FAD8; // type:function size:0xA4 scope:local
fn_8008FB7C = .text:0x8008FB7C; // type:function size:0xA4 ExecItemMega = .text:0x8008FB7C; // type:function size:0xA4 scope:local
fn_8008FC20 = .text:0x8008FC20; // type:function size:0xA4 ExecItemMiniSuper = .text:0x8008FC20; // type:function size:0xA4 scope:local
fn_8008FCC4 = .text:0x8008FCC4; // type:function size:0xA4 ExecItemMegaSuper = .text:0x8008FCC4; // type:function size:0xA4 scope:local
fn_8008FD68 = .text:0x8008FD68; // type:function size:0x584 ExecItemHammer = .text:0x8008FD68; // type:function size:0x584 scope:local
fn_800902EC = .text:0x800902EC; // type:function size:0xD34 ExecItemPipe = .text:0x800902EC; // type:function size:0xD34 scope:local
fn_80091020 = .text:0x80091020; // type:function size:0xEBC ExecItemSwap = .text:0x80091020; // type:function size:0xEBC scope:local
fn_80091EDC = .text:0x80091EDC; // type:function size:0x4FC ExecItemSpark = .text:0x80091EDC; // type:function size:0x4FC scope:local
fn_800923D8 = .text:0x800923D8; // type:function size:0xC8 ExecItemLight = .text:0x800923D8; // type:function size:0xC8 scope:local
fn_800924A0 = .text:0x800924A0; // type:function size:0xE3C ExecItemWhistle = .text:0x800924A0; // type:function size:0xE3C scope:local
fn_800932DC = .text:0x800932DC; // type:function size:0x3D4 ExecItemBowser = .text:0x800932DC; // type:function size:0x3D4 scope:local
fn_800936B0 = .text:0x800936B0; // type:function size:0x1370 ExecItemBooBall = .text:0x800936B0; // type:function size:0x1370 scope:local
fn_80094A20 = .text:0x80094A20; // type:function size:0x488 LampParticleUpdate = .text:0x80094A20; // type:function size:0x488 scope:local
fn_80094EA8 = .text:0x80094EA8; // type:function size:0x388 GenieParticleUpdate = .text:0x80094EA8; // type:function size:0x388 scope:local
fn_80095230 = .text:0x80095230; // type:function size:0xB0 GenieCameraProc = .text:0x80095230; // type:function size:0xB0 scope:local
fn_800952E0 = .text:0x800952E0; // type:function size:0x7A4 GenieCameraCalc = .text:0x800952E0; // type:function size:0x7A4 scope:local
fn_80095A84 = .text:0x80095A84; // type:function size:0x9D8 GenieSceneExec = .text:0x80095A84; // type:function size:0x9D8 scope:local
fn_8009645C = .text:0x8009645C; // type:function size:0x628 ExecItemGenie = .text:0x8009645C; // type:function size:0x628 scope:local
fn_80096A84 = .text:0x80096A84; // type:function size:0x3C BoardItemBagItemSet = .text:0x80096A84; // type:function size:0x3C
fn_80096AC0 = .text:0x80096AC0; // type:function size:0x13C ExecItemBagJump = .text:0x80096AC0; // type:function size:0x13C scope:local
fn_80096BFC = .text:0x80096BFC; // type:function size:0xDC ExecItemBagShow = .text:0x80096BFC; // type:function size:0xDC scope:local
fn_80096CD8 = .text:0x80096CD8; // type:function size:0x584 ExecItemBag = .text:0x80096CD8; // type:function size:0x584 scope:local
fn_8009725C = .text:0x8009725C; // type:function size:0x1C RestoreItemNull = .text:0x8009725C; // type:function size:0x1C scope:local
fn_80097278 = .text:0x80097278; // type:function size:0x2C RestoreItemMini = .text:0x80097278; // type:function size:0x2C scope:local
fn_800972A4 = .text:0x800972A4; // type:function size:0x2C RestoreItemMega = .text:0x800972A4; // type:function size:0x2C scope:local
fn_800972D0 = .text:0x800972D0; // type:function size:0x2C RestoreItemMiniSuper = .text:0x800972D0; // type:function size:0x2C scope:local
fn_800972FC = .text:0x800972FC; // type:function size:0x2C RestoreItemMegaSuper = .text:0x800972FC; // type:function size:0x2C scope:local
fn_80097328 = .text:0x80097328; // type:function size:0x284 RestoreItemBowser = .text:0x80097328; // type:function size:0x284 scope:local
BoardBowserExec = .text:0x800975AC; // type:function size:0x144 BoardBowserExec = .text:0x800975AC; // type:function size:0x144
fn_800976F0 = .text:0x800976F0; // type:function size:0x28C fn_800976F0 = .text:0x800976F0; // type:function size:0x28C
fn_8009797C = .text:0x8009797C; // type:function size:0x208 fn_8009797C = .text:0x8009797C; // type:function size:0x208
@ -5235,9 +5235,11 @@ statusItemPosTbl = .data:0x8013A584; // type:object size:0x30 scope:local data:f
itemMdlTbl = .data:0x8013A5B4; // type:object size:0x38 scope:local itemMdlTbl = .data:0x8013A5B4; // type:object size:0x38 scope:local
teamItemStatusPosTbl = .data:0x8013A5EC; // type:object size:0x18 scope:local data:float teamItemStatusPosTbl = .data:0x8013A5EC; // type:object size:0x18 scope:local data:float
coinMdl = .data:0x8013A608; // type:object size:0x14 scope:local coinMdl = .data:0x8013A608; // type:object size:0x14 scope:local
lbl_8013A620 = .data:0x8013A620; // type:object size:0x38 itemFuncTbl = .data:0x8013A620; // type:object size:0x38 scope:local
lbl_8013A658 = .data:0x8013A658; // type:object size:0x38 itemRestoreFuncTbl = .data:0x8013A658; // type:object size:0x38 scope:local
lbl_8013A690 = .data:0x8013A690; // type:object size:0x70 itemMdlTbl = .data:0x8013A690; // type:object size:0x38 scope:local
forceMoveSfxTbl = .data:0x8013A6C8; // type:object size:0x18 scope:local
callMotTbl = .data:0x8013A6E0; // type:object size:0x20 scope:local
lbl_8013A700 = .data:0x8013A700; // type:object size:0x13 data:string lbl_8013A700 = .data:0x8013A700; // type:object size:0x13 data:string
lbl_8013A713 = .data:0x8013A713; // type:object size:0x13 data:string lbl_8013A713 = .data:0x8013A713; // type:object size:0x13 data:string
lbl_8013A726 = .data:0x8013A726; // type:object size:0x13 data:string lbl_8013A726 = .data:0x8013A726; // type:object size:0x13 data:string
@ -5245,10 +5247,21 @@ lbl_8013A739 = .data:0x8013A739; // type:object size:0x13 data:string
lbl_8013A74C = .data:0x8013A74C; // type:object size:0x13 data:string lbl_8013A74C = .data:0x8013A74C; // type:object size:0x13 data:string
lbl_8013A75F = .data:0x8013A75F; // type:object size:0x13 data:string lbl_8013A75F = .data:0x8013A75F; // type:object size:0x13 data:string
lbl_8013A772 = .data:0x8013A772; // type:object size:0x13 data:string lbl_8013A772 = .data:0x8013A772; // type:object size:0x13 data:string
lbl_8013A785 = .data:0x8013A785; // type:object size:0x63 lbl_8013A785 = .data:0x8013A785; // type:object size:0x13 data:string
lbl_8013A7E8 = .data:0x8013A7E8; // type:object size:0x40 callHookTbl = .data:0x8013A798; // type:object size:0x20 scope:local
lbl_8013A828 = .data:0x8013A828; // type:object size:0x10 callAttackMotTbl = .data:0x8013A7B8; // type:object size:0x18 scope:local
lbl_8013A838 = .data:0x8013A838; // type:object size:0x1D8 callAttackMotTbl2 = .data:0x8013A7D0; // type:object size:0x18 scope:local
suitMotTbl = .data:0x8013A7E8; // type:object size:0x40 scope:local
lbl_8013A828 = .data:0x8013A828; // type:object size:0xE data:string
booMotTbl = .data:0x8013A838; // type:object size:0xC scope:local
shadowPos = .data:0x8013A844; // type:object size:0xC scope:local
shadowTarget = .data:0x8013A850; // type:object size:0xC scope:local
shadowUp = .data:0x8013A85C; // type:object size:0xC scope:local
armUpMotTbl = .data:0x8013A868; // type:object size:0x20 scope:local
scareMotTbl = .data:0x8013A888; // type:object size:0x20 scope:local
impactMotTbl = .data:0x8013A8A8; // type:object size:0x20 scope:local
cameraDataTbl = .data:0x8013A8C8; // type:object size:0x134 scope:local
genieMotTbl = .data:0x8013A9FC; // type:object size:0x10 scope:local
lbl_8013AA10 = .data:0x8013AA10; // type:object size:0x20 lbl_8013AA10 = .data:0x8013AA10; // type:object size:0x20
jumptable_8013AA30 = .data:0x8013AA30; // type:object size:0x1C scope:local jumptable_8013AA30 = .data:0x8013AA30; // type:object size:0x1C scope:local
lbl_8013AA4C = .data:0x8013AA4C; // type:object size:0x14 lbl_8013AA4C = .data:0x8013AA4C; // type:object size:0x14
@ -5555,8 +5568,11 @@ itemMdlId = .bss:0x801A4AF0; // type:object size:0x18 scope:local
pickerPos = .bss:0x801A4B08; // type:object size:0x30 scope:local pickerPos = .bss:0x801A4B08; // type:object size:0x30 scope:local
itemPosTemp = .bss:0x801A4B38; // type:object size:0x48 scope:local itemPosTemp = .bss:0x801A4B38; // type:object size:0x48 scope:local
coinF = .bss:0x801A4B80; // type:object size:0x28 scope:local coinF = .bss:0x801A4B80; // type:object size:0x28 scope:local
lbl_801A4BA8 = .bss:0x801A4BA8; // type:object size:0xC data:4byte booBallPos = .bss:0x801A4BA8; // type:object size:0xC scope:local data:4byte
lbl_801A4BB4 = .bss:0x801A4BB4; // type:object size:0x34 data:float booBallScale = .bss:0x801A4BB4; // type:object size:0xC scope:local data:float
booCamPos = .bss:0x801A4BC0; // type:object size:0xC scope:local data:float
booCamTarget = .bss:0x801A4BCC; // type:object size:0xC scope:local data:float
booCamUp = .bss:0x801A4BD8; // type:object size:0xC scope:local data:float
lbl_801A4BE8 = .bss:0x801A4BE8; // type:object size:0x30 lbl_801A4BE8 = .bss:0x801A4BE8; // type:object size:0x30
lbl_801A4C18 = .bss:0x801A4C18; // type:object size:0x18 lbl_801A4C18 = .bss:0x801A4C18; // type:object size:0x18
lbl_801A4C30 = .bss:0x801A4C30; // type:object size:0x10 data:2byte lbl_801A4C30 = .bss:0x801A4C30; // type:object size:0x10 data:2byte
@ -6438,19 +6454,19 @@ blockObj = .sbss:0x801D40E4; // type:object size:0x4 scope:local data:4byte
rotY = .sbss:0x801D40E8; // type:object size:0x4 scope:local data:float rotY = .sbss:0x801D40E8; // type:object size:0x4 scope:local data:float
scaleAngle = .sbss:0x801D40EC; // type:object size:0x4 scope:local data:float scaleAngle = .sbss:0x801D40EC; // type:object size:0x4 scope:local data:float
rotMax = .sbss:0x801D40F0; // type:object size:0x4 scope:local data:float rotMax = .sbss:0x801D40F0; // type:object size:0x4 scope:local data:float
lbl_801D40F8 = .sbss:0x801D40F8; // type:object size:0x4 data:4byte itemProc = .sbss:0x801D40F8; // type:object size:0x4 scope:local data:4byte
lbl_801D40FC = .sbss:0x801D40FC; // type:object size:0x8 data:2byte geniePlayerMot = .sbss:0x801D40FC; // type:object size:0x6 scope:local data:2byte
lbl_801D4104 = .sbss:0x801D4104; // type:object size:0x4 data:4byte genieParticleAnim = .sbss:0x801D4104; // type:object size:0x4 scope:local data:4byte
lbl_801D4108 = .sbss:0x801D4108; // type:object size:0x4 data:float genieFov = .sbss:0x801D4108; // type:object size:0x4 scope:local data:float
lbl_801D410C = .sbss:0x801D410C; // type:object size:0x8 booCoinStr = .sbss:0x801D410C; // type:object size:0x8 scope:local
lbl_801D4114 = .sbss:0x801D4114; // type:object size:0x4 data:float booBallAlpha = .sbss:0x801D4114; // type:object size:0x4 scope:local data:float
lbl_801D4118 = .sbss:0x801D4118; // type:object size:0x2 data:2byte booBallMdl = .sbss:0x801D4118; // type:object size:0x2 scope:local data:2byte
lbl_801D411C = .sbss:0x801D411C; // type:object size:0x8 data:4byte suitMdlId = .sbss:0x801D411C; // type:object size:0x8 scope:local data:4byte
lbl_801D4124 = .sbss:0x801D4124; // type:object size:0x8 data:4byte suitMotId = .sbss:0x801D4124; // type:object size:0x8 scope:local data:4byte
lbl_801D412C = .sbss:0x801D412C; // type:object size:0x2 data:2byte suitMdl = .sbss:0x801D412C; // type:object size:0x2 scope:local data:2byte
lbl_801D412E = .sbss:0x801D412E; // type:object size:0x1 data:byte currItem = .sbss:0x801D412E; // type:object size:0x1 scope:local data:byte
lbl_801D412F = .sbss:0x801D412F; // type:object size:0x1 data:byte currItemRestore = .sbss:0x801D412F; // type:object size:0x1 scope:local data:byte
lbl_801D4130 = .sbss:0x801D4130; // type:object size:0x8 itemBagItems = .sbss:0x801D4130; // type:object size:0x6 scope:local
lbl_801D4138 = .sbss:0x801D4138; // type:object size:0x4 data:4byte lbl_801D4138 = .sbss:0x801D4138; // type:object size:0x4 data:4byte
lbl_801D413C = .sbss:0x801D413C; // type:object size:0x4 data:4byte lbl_801D413C = .sbss:0x801D413C; // type:object size:0x4 data:4byte
lbl_801D4140 = .sbss:0x801D4140; // type:object size:0x4 data:4byte lbl_801D4140 = .sbss:0x801D4140; // type:object size:0x4 data:4byte

View file

@ -376,7 +376,7 @@ config.libs = [
Object(NonMatching, "game/board/star.c"), Object(NonMatching, "game/board/star.c"),
Object(NonMatching, "game/board/dice_roll.c"), Object(NonMatching, "game/board/dice_roll.c"),
Object(NonMatching, "game/board/ui.c"), Object(NonMatching, "game/board/ui.c"),
Object(NonMatching, "game/board/hidden_block.c"), Object(NonMatching, "game/board/block.c"),
Object(NonMatching, "game/board/item.c"), Object(NonMatching, "game/board/item.c"),
Object(NonMatching, "game/board/bowser.c"), Object(NonMatching, "game/board/bowser.c"),
Object(NonMatching, "game/board/battle.c"), Object(NonMatching, "game/board/battle.c"),