diff options
| author | Peppers1612 <71114652+Peppers1612@users.noreply.github.com> | 2020-12-03 16:52:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-03 16:52:26 -0500 |
| commit | 80c803b9ec8855fa2571f657cabe2b6eb91e7756 (patch) | |
| tree | 10a98a6812a98767414db971c03d3b518748441c /data | |
| parent | 579b87dceb94410c8d115fc75789c106cf08d5ca (diff) | |
ObjTimeblock OK (#421)
* ObjTimeblock: move data in source file
* ObjTimeblock: decomp Init()
* ObjTimeblock: decomp Destroy()
* ObjTimeblock: decomp func_80BA0058()/spawnDemoEffect()
* ObjTimeblock: decomp func_80B9FFA0()
* ObjTimeblock: decomp func_80BA040C()/mainActionFunc()
* ObjTimeblock: decomp func_80BA032C()
* ObjTimeblock: decomp func_80BA0480()
* ObjTimeblock: decomp func_80BA0514()
* ObjTimeblock: decomp func_80BA0524()
* ObjTimeblock: decomp func_80BA00CC()/toggleSceneSwitch()
* ObjTimeblock: decomp func_80BA04F8()
* ObjTimeblock: decomp func_80BA0508()/doNothing()
* ObjTimeblock: decomp func_80BA0758()
* ObjTimeblock: decomp func_80BA0768()
* ObjTimeblock: decomp func_80BA06AC()
* ObjTimeblock: decomp func_80BA083C()
* ObjTimeblock: decomp func_80BA084C()
* ObjTimeblock: decomp ObjTimeblock_Update()
* ObjTimeblock: decomp ObjTimeblock_Draw()
* ObjTimeblock: document the most obvious
* ObjTimeblock: use compiled reloc data
* ObjTimeblock: apply suggestions from mzxrules
* review
Co-authored-by: fig <fig02srl@gmail.com>
Diffstat (limited to 'data')
| -rw-r--r-- | data/overlays/actors/z_obj_timeblock.data.s | 30 | ||||
| -rw-r--r-- | data/overlays/actors/z_obj_timeblock.reloc.s | 13 |
2 files changed, 0 insertions, 43 deletions
diff --git a/data/overlays/actors/z_obj_timeblock.data.s b/data/overlays/actors/z_obj_timeblock.data.s deleted file mode 100644 index 45611cd49..000000000 --- a/data/overlays/actors/z_obj_timeblock.data.s +++ /dev/null @@ -1,30 +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 purpose registers - -.section .data - -.balign 16 - -glabel Obj_Timeblock_InitVars - .word 0x01D10700, 0x0A000011, 0x01900000, 0x0000017C -.word ObjTimeblock_Init -.word ObjTimeblock_Destroy -.word ObjTimeblock_Update -.word ObjTimeblock_Draw -glabel D_80BA0AF0 - .word 0x3F800000 -glabel D_80BA0AF4 - .word 0x42700000 -glabel D_80BA0AF8 - .word 0x00180000, 0x3F19999A, 0x42200000, 0x00190000 -glabel D_80BA0B08 - .word 0x42700000, 0x42C80000, 0x430C0000, 0x43340000, 0x435C0000, 0x43820000, 0x43960000, 0x43960000 -glabel D_80BA0B28 - .word 0x801F0002, 0xB0F40708, 0xB0F8012C, 0x30FC05DC -glabel D_80BA0B38 - .word 0x64788C50, 0x8CC86496, 0xC864C8F0, 0x506E8C46, 0xA0E15064, 0x82646EBE - diff --git a/data/overlays/actors/z_obj_timeblock.reloc.s b/data/overlays/actors/z_obj_timeblock.reloc.s deleted file mode 100644 index 435a0c339..000000000 --- a/data/overlays/actors/z_obj_timeblock.reloc.s +++ /dev/null @@ -1,13 +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 purpose registers - -.section .rodata - -.balign 16 - -glabel D_80BA0C50 - .incbin "baserom/ovl_Obj_Timeblock", 0xCB0, 0x00000110 |