diff options
| -rw-r--r-- | asm/rom5.s | 2 | ||||
| -rw-r--r-- | data/data2.s | 46 | ||||
| -rw-r--r-- | graphics/rotating_gates/0.png | bin | 0 -> 157 bytes | |||
| -rw-r--r-- | graphics/rotating_gates/1.png | bin | 0 -> 171 bytes | |||
| -rw-r--r-- | graphics/rotating_gates/2.png | bin | 0 -> 170 bytes | |||
| -rw-r--r-- | graphics/rotating_gates/3.png | bin | 0 -> 171 bytes | |||
| -rw-r--r-- | graphics/rotating_gates/4.png | bin | 0 -> 162 bytes | |||
| -rw-r--r-- | graphics/rotating_gates/5.png | bin | 0 -> 176 bytes | |||
| -rw-r--r-- | graphics/rotating_gates/6.png | bin | 0 -> 175 bytes | |||
| -rw-r--r-- | graphics/rotating_gates/7.png | bin | 0 -> 176 bytes |
10 files changed, 44 insertions, 4 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index 5a0d676bb..7431fd695 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -157608,7 +157608,7 @@ LoadRotatingGatePics: @ 80C7DB0 pop {r0} bx r0 .align 2, 0 -_080C7DBC: .4byte gUnknown_083D5E1C +_080C7DBC: .4byte gRotatingGatesGraphicsTable thumb_func_end LoadRotatingGatePics thumb_func_start sub_80C7DC0 diff --git a/data/data2.s b/data/data2.s index b28562032..cf99b86bb 100644 --- a/data/data2.s +++ b/data/data2.s @@ -13483,7 +13483,39 @@ gUnknown_083D2964:: @ 83D2964 .incbin "baserom.gba", 0x003d2964, 0x38 gUnknown_083D299C:: @ 83D299C - .incbin "baserom.gba", 0x003d299c, 0x3470 + .incbin "baserom.gba", 0x003d299c, 0x70 + + .align 2 +RotatingGateTiles_1: @ 83D2A0C + .incbin "graphics/rotating_gates/1.4bpp" + + .align 2 +RotatingGateTiles_2: @ 83D320C + .incbin "graphics/rotating_gates/2.4bpp" + + .align 2 +RotatingGateTiles_3: @ 83D3A0C + .incbin "graphics/rotating_gates/3.4bpp" + + .align 2 +RotatingGateTiles_5: @ 83D420C + .incbin "graphics/rotating_gates/5.4bpp" + + .align 2 +RotatingGateTiles_6: @ 83D4A0C + .incbin "graphics/rotating_gates/6.4bpp" + + .align 2 +RotatingGateTiles_7: @ 83D520C + .incbin "graphics/rotating_gates/7.4bpp" + + .align 2 +RotatingGateTiles_0: @ 83D5A0C + .incbin "graphics/rotating_gates/0.4bpp" + + .align 2 +RotatingGateTiles_4: @ 83D5C0C + .incbin "graphics/rotating_gates/4.4bpp" .align 2 gOamData_83D5E0C:: @ 83D5E0C @@ -13498,8 +13530,16 @@ gOamData_83D5E14:: @ 83D5E14 .2byte 0x5800 .align 2 -gUnknown_083D5E1C:: @ 83D5E1C - .incbin "baserom.gba", 0x003d5e1c, 0x48 +gRotatingGatesGraphicsTable:: @ 83D5E1C + obj_tiles RotatingGateTiles_0, 0x200, 0x1300 + obj_tiles RotatingGateTiles_1, 0x800, 0x1301 + obj_tiles RotatingGateTiles_2, 0x800, 0x1302 + obj_tiles RotatingGateTiles_3, 0x800, 0x1303 + obj_tiles RotatingGateTiles_4, 0x200, 0x1304 + obj_tiles RotatingGateTiles_5, 0x800, 0x1305 + obj_tiles RotatingGateTiles_6, 0x800, 0x1306 + obj_tiles RotatingGateTiles_7, 0x800, 0x1307 + null_obj_tiles .align 2 gSpriteAnim_83D5E64:: @ 83D5E64 diff --git a/graphics/rotating_gates/0.png b/graphics/rotating_gates/0.png Binary files differnew file mode 100644 index 000000000..653b8b9e1 --- /dev/null +++ b/graphics/rotating_gates/0.png diff --git a/graphics/rotating_gates/1.png b/graphics/rotating_gates/1.png Binary files differnew file mode 100644 index 000000000..07171242e --- /dev/null +++ b/graphics/rotating_gates/1.png diff --git a/graphics/rotating_gates/2.png b/graphics/rotating_gates/2.png Binary files differnew file mode 100644 index 000000000..9aa721951 --- /dev/null +++ b/graphics/rotating_gates/2.png diff --git a/graphics/rotating_gates/3.png b/graphics/rotating_gates/3.png Binary files differnew file mode 100644 index 000000000..e589b06f6 --- /dev/null +++ b/graphics/rotating_gates/3.png diff --git a/graphics/rotating_gates/4.png b/graphics/rotating_gates/4.png Binary files differnew file mode 100644 index 000000000..32cf863bd --- /dev/null +++ b/graphics/rotating_gates/4.png diff --git a/graphics/rotating_gates/5.png b/graphics/rotating_gates/5.png Binary files differnew file mode 100644 index 000000000..1b8562b36 --- /dev/null +++ b/graphics/rotating_gates/5.png diff --git a/graphics/rotating_gates/6.png b/graphics/rotating_gates/6.png Binary files differnew file mode 100644 index 000000000..11831e3c3 --- /dev/null +++ b/graphics/rotating_gates/6.png diff --git a/graphics/rotating_gates/7.png b/graphics/rotating_gates/7.png Binary files differnew file mode 100644 index 000000000..a1e29d0d4 --- /dev/null +++ b/graphics/rotating_gates/7.png |
