mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-08 15:30:14 +00:00
Code Issues Projects Releases Wiki Activity

Bg_Spot16_Bombstone (#405)

Browse source 
* First working function

* Syncing up

* Not OK - something wrong with data elements

* Not OK - syncing files

* OK now.  Fixed data issue

* Not OK - data issue

* Not OK - syncing files

* OK - added another function and commented out init for now

* OK - another function

* Not OK - working on function

* OK - Added working functions back

* OK - another function

* Not OK - syncing files

* Not OK - updating undefined syms

* OK - Draw function

* Not OK - slightly closer on 5950

* OK - another function

* OK - another function

* OK - another function

* OK - another function

* OK - finally fixed init

* Lots of cleanup and renaming

* Removed data files

* Minor cleanup

* Removed commented out line

* Minor cleanup

* More minor cleanup

* More minor cleanup

* More cleanup

* Removed unneeded dereferences

* Minor cleanup

* Minor cleanup

* More cleanup

* Update src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* More cleanup

* More cleanup

* Removed structs

* Minor cleanup

* Apply suggestions from code review

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Changed EnBombf to Actor

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
Darin 2020-09-26 18:26:21 -07:00 • committed by GitHub
parent 08bf25fca7
commit b48fa7ff4a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 503 additions and 1403 deletions
Download patch file Download diff file Expand all files Collapse all files

47
data/overlays/actors/z_bg_spot16_bombstone.data.s
View file

@ -1,47 +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 D_808B5DD0
.word 0x00000000
glabel D_808B5DD4
.word 0x00000000
glabel D_808B5DD8
.word 0x00080004, 0x004607D0, 0xFCE00000, 0x00640000, 0x00000000, 0x00060003, 0x003200C8, 0x0A28C350, 0x005A0000, 0x00000000, 0x00050003, 0x0028F63C, 0x019030B0, 0x00320000, 0x00000000, 0x00030001, 0x003C0258, 0xFF9CAFC8, 0x00320000, 0x00000000, 0x00030001, 0x0028F2B8, 0xFF9C6590, 0x001E0000, 0x00000000, 0x00060009, 0x00280000, 0x0BB8D8F0, 0x001E0000, 0x00000000
glabel D_808B5E50
.word 0x00000000, 0x00000000, 0x00000000, 0x4FC1FFF6, 0x00000000, 0x00010100, 0x00000000, 0x00320000, 0x01200064
glabel D_808B5E74
.word 0x0C000D39, 0x20000000, 0x00000001
.word D_808B5E50
glabel D_808B5E84
.word 0x0A000900, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000000, 0x00010000, 0x00BE0050, 0x0000000A, 0x00000032
glabel D_808B5EB0
.word 0x0000000A, 0x003CFFF6, 0x010401E0, 0x00070000, 0x00000032, 0x00000104, 0x017C000D, 0x0001001E, 0x00140014, 0x00A00104, 0x000A0002, 0x00140028, 0x001400C8, 0x00960007, 0x0003FFD8, 0x0064001E, 0x00D20064, 0x00070004, 0x000A0078, 0x000A00A0, 0x0028000A, 0x0005FFA7, 0x006E0041, 0x00960118, 0x00070006, 0xFFC40070, 0x006D006E, 0x00820007, 0x0007FFF2, 0x0050007F, 0x008C00D2, 0x00070008, 0x00140032, 0x001E008C, 0x00C80007, 0x0009FFEC, 0x00140028, 0x00C800B4, 0x0007000A, 0x001E0028, 0xFFE20064, 0x00780007, 0x000AFF92, 0x001D0078, 0x008C0118, 0x000A000B, 0x001E0014, 0x001E0050, 0x00C80006, 0x000C0028, 0x001EFFE2, 0x00AA010E, 0x0011000D, 0xFFD80032, 0xFFEC008C, 0x00560006, 0x000D0032, 0x00320032, 0x009600C8, 0x000A000E, 0x00280028, 0xFFD8003C, 0x00A00006, 0x000FFFE2, 0x00140032, 0x00AA012C, 0x00060010, 0x00280032, 0x001400AA, 0x00780007, 0x0010001E, 0x0032003C, 0x009600C8, 0x00060011, 0x000A000A, 0x00000082, 0x00DC0006, 0x0012000A, 0x00280014, 0x00B400DC, 0x000B0013, 0x000A0005, 0x0000006E, 0x00460011, 0x0013FFEC, 0x0032FFE2, 0x009600C8, 0x00060014, 0x00500032, 0x00000096, 0x00C80008
glabel Bg_Spot16_Bombstone_InitVars
.word 0x00CD0600, 0x00000010, 0x00C20000, 0x00000218
.word BgSpot16Bombstone_Init
.word BgSpot16Bombstone_Destroy
.word BgSpot16Bombstone_Update
.word BgSpot16Bombstone_Draw
glabel D_808B603C
.word 0xB0F407D0, 0xB0F801F4, 0x30FC03E8
glabel D_808B6048
.word 0xB06CFFFF, 0xB070FFF6, 0xB0F403E8, 0xB0F800C8, 0x30FC03E8
glabel D_808B605C
.word 0x00000000, 0x00000000, 0x00000000
glabel D_808B6068
.word 0x00000000, 0x3ECCCCCD, 0x00000000
glabel D_808B6074
.word 0x42840000, 0x424C0000, 0x42400000, 0x42100000, 0x41A80000
glabel D_808B6088
.byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x04
glabel D_808B6092
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

13
data/overlays/actors/z_bg_spot16_bombstone.reloc.s
View file

@ -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_808B6270
.incbin "baserom/ovl_Bg_Spot16_Bombstone", 0x1640, 0x000001D0