Leahnaya/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-08-27 21:04:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #351 from Touched/decompile/rotating_gate

Browse Source 
Decompile rotating_gate.s
This commit is contained in:
yenatch
2017-07-05 21:31:11 -04:00
committed by GitHub
parent 550333dd91 c2daf4f6c9
commit 1eacd4ee74
8 changed files with 1237 additions and 1405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1085
asm/rotating_gate.s
View File

File diff suppressed because it is too large Load Diff

311
data/rotating_gate.s
View File

@@ -1,311 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_083D2964:: @ 83D2964
.byte 12, 0, 5, 0, 3, 0, 0, 0
.byte 14, 0, 7, 0, 3, 3, 0, 0
.byte 16, 0, 4, 0, 5, 1, 0, 0
.byte 15, 0, 14, 0, 1, 0, 0, 0
.byte 18, 0, 13, 0, 4, 2, 0, 0
.byte 8, 0, 20, 0, 4, 2, 0, 0
.byte 16, 0, 20, 0, 7, 1, 0, 0
.align 2
gUnknown_083D299C:: @ 83D299C
.byte 13, 0, 3, 0, 4, 3, 0, 0
.byte 12, 0, 6, 0, 4, 2, 0, 0
.byte 3, 0, 6, 0, 4, 2, 0, 0
.byte 3, 0, 9, 0, 5, 3, 0, 0
.byte 8, 0, 8, 0, 0, 1, 0, 0
.byte 2, 0, 12, 0, 6, 2, 0, 0
.byte 9, 0, 13, 0, 1, 0, 0, 0
.byte 3, 0, 14, 0, 2, 1, 0, 0
.byte 9, 0, 15, 0, 3, 2, 0, 0
.byte 3, 0, 18, 0, 5, 2, 0, 0
.byte 2, 0, 19, 0, 4, 0, 0, 0
.byte 5, 0, 21, 0, 0, 0, 0, 0
.byte 9, 0, 19, 0, 3, 3, 0, 0
.byte 12, 0, 20, 0, 4, 1, 0, 0
.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
.2byte 0x0100
.2byte 0xC000
.2byte 0x5800
.align 2
gOamData_83D5E14:: @ 83D5E14
.2byte 0x0100
.2byte 0x8000
.2byte 0x5800
.align 2
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
obj_image_anim_frame 0, 0
obj_image_anim_end
.align 2
gSpriteAnim_83D5E6C:: @ 83D5E6C
obj_image_anim_frame 0, 0
obj_image_anim_end
.align 2
gSpriteAnimTable_83D5E74:: @ 83D5E74
.4byte gSpriteAnim_83D5E64
.align 2
gSpriteAnimTable_83D5E78:: @ 83D5E78
.4byte gSpriteAnim_83D5E6C
.align 2
gSpriteAffineAnim_83D5E7C:: @ 83D5E7C
obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
obj_rot_scal_anim_jump 0
.align 2
gSpriteAffineAnim_83D5E8C:: @ 83D5E8C
obj_rot_scal_anim_frame 0x100, 0x100, -64, 0
obj_rot_scal_anim_jump 0
.align 2
gSpriteAffineAnim_83D5E9C:: @ 83D5E9C
obj_rot_scal_anim_frame 0x100, 0x100, -128, 0
obj_rot_scal_anim_jump 0
.align 2
gSpriteAffineAnim_83D5EAC:: @ 83D5EAC
obj_rot_scal_anim_frame 0x100, 0x100, 64, 0
obj_rot_scal_anim_jump 0
.align 2
gSpriteAffineAnim_83D5EBC:: @ 83D5EBC
obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
obj_rot_scal_anim_frame 0x0, 0x0, -4, 16
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_83D5ED4:: @ 83D5ED4
obj_rot_scal_anim_frame 0x100, 0x100, -64, 0
obj_rot_scal_anim_frame 0x0, 0x0, -4, 16
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_83D5EEC:: @ 83D5EEC
obj_rot_scal_anim_frame 0x100, 0x100, -128, 0
obj_rot_scal_anim_frame 0x0, 0x0, -4, 16
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_83D5F04:: @ 83D5F04
obj_rot_scal_anim_frame 0x100, 0x100, 64, 0
obj_rot_scal_anim_frame 0x0, 0x0, -4, 16
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_83D5F1C:: @ 83D5F1C
obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
obj_rot_scal_anim_frame 0x0, 0x0, 4, 16
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_83D5F34:: @ 83D5F34
obj_rot_scal_anim_frame 0x100, 0x100, 64, 0
obj_rot_scal_anim_frame 0x0, 0x0, 4, 16
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_83D5F4C:: @ 83D5F4C
obj_rot_scal_anim_frame 0x100, 0x100, -128, 0
obj_rot_scal_anim_frame 0x0, 0x0, 4, 16
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_83D5F64:: @ 83D5F64
obj_rot_scal_anim_frame 0x100, 0x100, -64, 0
obj_rot_scal_anim_frame 0x0, 0x0, 4, 16
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_83D5F7C:: @ 83D5F7C
obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
obj_rot_scal_anim_frame 0x0, 0x0, -8, 8
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_83D5F94:: @ 83D5F94
obj_rot_scal_anim_frame 0x100, 0x100, -64, 0
obj_rot_scal_anim_frame 0x0, 0x0, -8, 8
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_83D5FAC:: @ 83D5FAC
obj_rot_scal_anim_frame 0x100, 0x100, -128, 0
obj_rot_scal_anim_frame 0x0, 0x0, -8, 8
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_83D5FC4:: @ 83D5FC4
obj_rot_scal_anim_frame 0x100, 0x100, 64, 0
obj_rot_scal_anim_frame 0x0, 0x0, -8, 8
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_83D5FDC:: @ 83D5FDC
obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
obj_rot_scal_anim_frame 0x0, 0x0, 8, 8
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_83D5FF4:: @ 83D5FF4
obj_rot_scal_anim_frame 0x100, 0x100, 64, 0
obj_rot_scal_anim_frame 0x0, 0x0, 8, 8
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_83D600C:: @ 83D600C
obj_rot_scal_anim_frame 0x100, 0x100, -128, 0
obj_rot_scal_anim_frame 0x0, 0x0, 8, 8
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_83D6024:: @ 83D6024
obj_rot_scal_anim_frame 0x100, 0x100, -64, 0
obj_rot_scal_anim_frame 0x0, 0x0, 8, 8
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnimTable_83D603C:: @ 83D603C
.4byte gSpriteAffineAnim_83D5E7C
.4byte gSpriteAffineAnim_83D5E8C
.4byte gSpriteAffineAnim_83D5E9C
.4byte gSpriteAffineAnim_83D5EAC
.4byte gSpriteAffineAnim_83D5F1C
.4byte gSpriteAffineAnim_83D5F64
.4byte gSpriteAffineAnim_83D5F4C
.4byte gSpriteAffineAnim_83D5F34
.4byte gSpriteAffineAnim_83D5EBC
.4byte gSpriteAffineAnim_83D5ED4
.4byte gSpriteAffineAnim_83D5EEC
.4byte gSpriteAffineAnim_83D5F04
.4byte gSpriteAffineAnim_83D5FDC
.4byte gSpriteAffineAnim_83D6024
.4byte gSpriteAffineAnim_83D600C
.4byte gSpriteAffineAnim_83D5FF4
.4byte gSpriteAffineAnim_83D5F7C
.4byte gSpriteAffineAnim_83D5F94
.4byte gSpriteAffineAnim_83D5FAC
.4byte gSpriteAffineAnim_83D5FC4
.align 2
gSpriteTemplate_83D608C:: @ 83D608C
spr_template 4864, 0xFFFF, gOamData_83D5E0C, gSpriteAnimTable_83D5E74, NULL, gSpriteAffineAnimTable_83D603C, sub_80C7C94
.align 2
gSpriteTemplate_83D60A4:: @ 83D60A4
spr_template 4864, 0xFFFF, gOamData_83D5E14, gSpriteAnimTable_83D5E78, NULL, gSpriteAffineAnimTable_83D603C, sub_80C7C94
gUnknown_083D60BC:: @ 83D60BC
.byte 255, 255, 255, 255
.byte 39, 38, 18, 19
.byte 255, 255, 255, 255
.byte 255, 255, 255, 255
gUnknown_083D60CC:: @ 83D60CC
.byte 255, 255, 255, 255
.byte 255, 255, 255, 255
.byte 23, 22, 34, 35
.byte 255, 255, 255, 255
gUnknown_083D60DC:: @ 83D60DC
.byte 255, 17, 255, 255
.byte 255, 16, 255, 255
.byte 255, 36, 255, 255
.byte 255, 37, 255, 255
gUnknown_083D60EC:: @ 83D60EC
.byte 255, 255, 33, 255
.byte 255, 255, 32, 255
.byte 255, 255, 20, 255
.byte 255, 255, 21, 255
gUnknown_083D60FC:: @ 83D60FC
.byte 0, -1, 0, 0
.byte 1, -2, 0, 0
.byte 0, 0, 0, 0
.byte 1, 0, 0, 0
.byte -1, 0, 0, 0
.byte -1, 1, 0, 0
.byte -1, -1, 0, 0
.byte -2, -1, 0, 0
gUnknown_083D611C:: @ 83D611C
.byte -1, -1, 0, 0
.byte -1, -2, 0, 0
.byte 0, -1, 0, 0
.byte 1, -1, 0, 0
.byte 0, 0, 0, 0
.byte 0, 1, 0, 0
.byte -1, 0, 0, 0
.byte -2, 0, 0, 0
.align 2
gUnknown_083D613C:: @ 83D613C
.byte 1, 0, 1, 0, 0, 0, 0, 0
.byte 1, 1, 1, 0, 0, 0, 0, 0
.byte 1, 0, 1, 1, 0, 0, 0, 0
.byte 1, 1, 1, 1, 0, 0, 0, 0
.byte 1, 0, 1, 0, 1, 0, 0, 0
.byte 1, 1, 1, 0, 1, 0, 0, 0
.byte 1, 0, 1, 1, 1, 0, 0, 0
.byte 1, 0, 1, 0, 1, 1, 0, 0
.byte 1, 1, 1, 1, 1, 0, 0, 0
.byte 1, 1, 1, 0, 1, 1, 0, 0
.byte 1, 0, 1, 1, 1, 1, 0, 0
.byte 1, 1, 1, 1, 1, 1, 0, 0

4
data/specials.inc
View File

@@ -201,8 +201,8 @@ gSpecials::
.4byte sub_80B7D0C
.4byte ExecuteWhiteOut
.4byte sp0C8_whiteout_maybe
.4byte sub_80C8040
.4byte sub_80C8080
.4byte RotatingGate_InitPuzzle
.4byte RotatingGate_InitPuzzleAndGraphics
.4byte SetSSTidalFlag
.4byte ResetSSTidalFlag
.4byte EnterSafariMode

2
include/rotating_gate.h
View File

@@ -2,7 +2,7 @@
#define GUARD_ROTATING_GATE_H
void RotatingGatePuzzleCameraUpdate(s16, s16);
void sub_80C8080();
void RotatingGate_InitPuzzleAndGraphics();
u32 CheckForRotatingGatePuzzleCollision(u8, s16, s16);
#endif // GUARD_ROTATING_GATE_H

4
ld_script.txt
View File

@@ -179,7 +179,7 @@ SECTIONS {
src/pokemon_size_record.o(.text);
asm/fldeff_80C5CD4.o(.text);
src/field_special_scene.o(.text);
asm/rotating_gate.o(.text);
src/rotating_gate.o(.text);
src/safari_zone.o(.text);
asm/contest_link_80C857C.o(.text);
src/contest_link_80C857C.o(.text);
@@ -417,7 +417,7 @@ SECTIONS {
data/fldeff_80C5CD4.o(.rodata);
src/field_special_scene.o(.rodata);
data/field_special_scene.o(.rodata);
data/rotating_gate.o(.rodata);
src/rotating_gate.o(.rodata);
src/item_use.o(.rodata);
data/battle_anim_80CA710.o(.rodata);
src/bike.o(.rodata);

2
src/rom4.c
View File

@@ -1672,7 +1672,7 @@ void mli4_mapscripts_and_other(void)
void sub_8054E20(void)
{
sub_805B710(0, 0);
sub_80C8080();
RotatingGate_InitPuzzleAndGraphics();
}
void sub_8054E34(void)

1228
src/rotating_gate.c Normal file
View File

File diff suppressed because it is too large Load Diff

6
sym_ewram.txt
View File

@@ -773,13 +773,13 @@ gUnknown_020387E8: @ 20387E8
gUnknown_020387EC: @ 20387EC
.space 0x4
gUnknown_020387F0: @ 20387F0
gRotatingGate_GateSpriteIds: @ 20387F0
.space 0x10
gUnknown_02038800: @ 2038800
gRotatingGate_PuzzleConfig: @ 2038800
.space 0x4
gUnknown_02038804: @ 2038804
gRotatingGate_PuzzleCount: @ 2038804
.space 0x4
.include "src/safari_zone.o"