ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Decompile rotating_rate & remove debug check

Browse Source
This commit is contained in:
KDSKardabox 2018-04-18 14:09:50 +05:30
parent 86f46ff8eb
commit b818924feb
10 changed files with 1196 additions and 1457 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/field_player_avatar.s
View File

@ -1071,7 +1071,7 @@ sub_808B164: @ 808B164
adds r0, r6, 0
adds r1, r5, 0
adds r2, r4, 0
bl sub_80FBFD4
bl CheckForRotatingGatePuzzleCollisionWithoutAnimation
cmp r0, 0
beq _0808B1A2
movs r0, 0x8

1152
asm/rotating_gate.s
View File

File diff suppressed because it is too large Load Diff

285
data/rotating_gate.s
View File

@ -1,285 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_0858E8B0:: @ 858E8B0
.2byte 0x0006, 0x0007
.byte 0x05, 0x01
.align 2
.2byte 0x0009, 0x000f
.byte 0x05, 0x02
.align 2
.2byte 0x0003, 0x0013
.byte 0x05, 0x01
.align 2
.2byte 0x0002, 0x0006
.byte 0x04, 0x01
.align 2
.2byte 0x0009, 0x000c
.byte 0x04, 0x00
.align 2
.2byte 0x0006, 0x0017
.byte 0x04, 0x00
.align 2
.2byte 0x000c, 0x0016
.byte 0x04, 0x00
.align 2
.2byte 0x0006, 0x0003
.byte 0x03, 0x02
.align 2
gUnknown_0858E8F0:: @ 858E8F0
.2byte 0x000e, 0x0005
.byte 0x04, 0x01
.align 2
.2byte 0x000a, 0x0006
.byte 0x01, 0x02
.align 2
.2byte 0x0006, 0x0006
.byte 0x03, 0x01
.align 2
.2byte 0x000e, 0x0008
.byte 0x04, 0x01
.align 2
.2byte 0x0003, 0x000a
.byte 0x02, 0x03
.align 2
.2byte 0x0009, 0x000e
.byte 0x00, 0x01
.align 2
.2byte 0x0003, 0x000f
.byte 0x06, 0x00
.align 2
.2byte 0x0002, 0x0011
.byte 0x01, 0x02
.align 2
.2byte 0x000c, 0x0012
.byte 0x06, 0x03
.align 2
.2byte 0x0005, 0x0012
.byte 0x03, 0x01
.align 2
.2byte 0x000a, 0x0013
.byte 0x02, 0x02
.align 2
gUnknown_0858E948:: @ 858E948
.incbin "graphics/misc/rotating_gate_1.4bpp"
.align 2
gUnknown_0858EB48:: @ 858EB48
.incbin "graphics/misc/rotating_gate_2.4bpp"
.align 2
gUnknown_0858F348:: @ 858F348
.incbin "graphics/misc/rotating_gate_3.4bpp"
.align 2
gUnknown_0858FB48:: @ 858FB48
.incbin "graphics/misc/rotating_gate_4.4bpp"
.align 2
gUnknown_08590348:: @ 8590348
.incbin "graphics/misc/rotating_gate_5.4bpp"
.align 2
gUnknown_08590548:: @ 8590548
.incbin "graphics/misc/rotating_gate_6.4bpp"
.align 2
gUnknown_08590D48:: @ 8590D48
.incbin "graphics/misc/rotating_gate_7.4bpp"
.align 2
gUnknown_08591548:: @ 8591548
.incbin "graphics/misc/rotating_gate_8.4bpp"
.align 2
gOamData_8591D48:: @ 8591D48
.2byte 0x0100, 0xc000, 0x2800
.align 2
gOamData_8591D50:: @ 8591D50
.2byte 0x0100, 0x8000, 0x2800
.align 2
gUnknown_08591D58:: @ 8591D58
obj_tiles gUnknown_0858E948, 0x0200, 0x1300
obj_tiles gUnknown_0858EB48, 0x0800, 0x1301
obj_tiles gUnknown_0858F348, 0x0800, 0x1302
obj_tiles gUnknown_0858FB48, 0x0800, 0x1303
obj_tiles gUnknown_08590348, 0x0200, 0x1304
obj_tiles gUnknown_08590548, 0x0800, 0x1305
obj_tiles gUnknown_08590D48, 0x0800, 0x1306
obj_tiles gUnknown_08591548, 0x0800, 0x1307
null_obj_tiles
.align 2
gSpriteAnim_8591DA0:: @ 8591DA0
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_8591DA8:: @ 8591DA8
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnimTable_8591DB0:: @ 8591DB0
.4byte gSpriteAnim_8591DA0
.align 2
gSpriteAnimTable_8591DB4:: @ 8591DB4
.4byte gSpriteAnim_8591DA8
.align 2
gSpriteAffineAnim_8591DB8:: @ 8591DB8
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591DC8:: @ 8591DC8
.2byte 0x0100, 0x0100, 0x00c0, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591DD8:: @ 8591DD8
.2byte 0x0100, 0x0100, 0x0080, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591DE8:: @ 8591DE8
.2byte 0x0100, 0x0100, 0x0040, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591DF8:: @ 8591DF8
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x10fc, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591E10:: @ 8591E10
.2byte 0x0100, 0x0100, 0x00c0, 0x0000, 0x0000, 0x0000, 0x10fc, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591E28:: @ 8591E28
.2byte 0x0100, 0x0100, 0x0080, 0x0000, 0x0000, 0x0000, 0x10fc, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591E40:: @ 8591E40
.2byte 0x0100, 0x0100, 0x0040, 0x0000, 0x0000, 0x0000, 0x10fc, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591E58:: @ 8591E58
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x1004, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591E70:: @ 8591E70
.2byte 0x0100, 0x0100, 0x0040, 0x0000, 0x0000, 0x0000, 0x1004, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591E88:: @ 8591E88
.2byte 0x0100, 0x0100, 0x0080, 0x0000, 0x0000, 0x0000, 0x1004, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591EA0:: @ 8591EA0
.2byte 0x0100, 0x0100, 0x00c0, 0x0000, 0x0000, 0x0000, 0x1004, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591EB8:: @ 8591EB8
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x08f8, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591ED0:: @ 8591ED0
.2byte 0x0100, 0x0100, 0x00c0, 0x0000, 0x0000, 0x0000, 0x08f8, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591EE8:: @ 8591EE8
.2byte 0x0100, 0x0100, 0x0080, 0x0000, 0x0000, 0x0000, 0x08f8, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591F00:: @ 8591F00
.2byte 0x0100, 0x0100, 0x0040, 0x0000, 0x0000, 0x0000, 0x08f8, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591F18:: @ 8591F18
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x0808, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591F30:: @ 8591F30
.2byte 0x0100, 0x0100, 0x0040, 0x0000, 0x0000, 0x0000, 0x0808, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591F48:: @ 8591F48
.2byte 0x0100, 0x0100, 0x0080, 0x0000, 0x0000, 0x0000, 0x0808, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591F60:: @ 8591F60
.2byte 0x0100, 0x0100, 0x00c0, 0x0000, 0x0000, 0x0000, 0x0808, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnimTable_8591F78:: @ 8591F78
.4byte gSpriteAffineAnim_8591DB8
.4byte gSpriteAffineAnim_8591DC8
.4byte gSpriteAffineAnim_8591DD8
.4byte gSpriteAffineAnim_8591DE8
.4byte gSpriteAffineAnim_8591E58
.4byte gSpriteAffineAnim_8591EA0
.4byte gSpriteAffineAnim_8591E88
.4byte gSpriteAffineAnim_8591E70
.4byte gSpriteAffineAnim_8591DF8
.4byte gSpriteAffineAnim_8591E10
.4byte gSpriteAffineAnim_8591E28
.4byte gSpriteAffineAnim_8591E40
.4byte gSpriteAffineAnim_8591F18
.4byte gSpriteAffineAnim_8591F60
.4byte gSpriteAffineAnim_8591F48
.4byte gSpriteAffineAnim_8591F30
.4byte gSpriteAffineAnim_8591EB8
.4byte gSpriteAffineAnim_8591ED0
.4byte gSpriteAffineAnim_8591EE8
.4byte gSpriteAffineAnim_8591F00
.align 2
gUnknown_08591FC8:: @ 8591FC8
spr_template 0x1300, 0xffff, gOamData_8591D48, gSpriteAnimTable_8591DB0, NULL, gSpriteAffineAnimTable_8591F78, sub_80FBAE4
.align 2
gUnknown_08591FE0:: @ 8591FE0
spr_template 0x1300, 0xffff, gOamData_8591D50, gSpriteAnimTable_8591DB4, NULL, gSpriteAffineAnimTable_8591F78, sub_80FBAE4
gUnknown_08591FF8:: @ 8591FF8
.byte 0xff, 0xff, 0xff, 0xff, 0x27, 0x26, 0x12, 0x13, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
gUnknown_08592008:: @ 8592008
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x16, 0x22, 0x23, 0xff, 0xff, 0xff, 0xff
gUnknown_08592018:: @ 8592018
.byte 0xff, 0x11, 0xff, 0xff, 0xff, 0x10, 0xff, 0xff, 0xff, 0x24, 0xff, 0xff, 0xff, 0x25, 0xff, 0xff
gUnknown_08592028:: @ 8592028
.byte 0xff, 0xff, 0x21, 0xff, 0xff, 0xff, 0x20, 0xff, 0xff, 0xff, 0x14, 0xff, 0xff, 0xff, 0x15, 0xff
gUnknown_08592038:: @ 8592038
.byte 0x00, 0xff, 0x00, 0x00, 0x01, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xfe, 0xff, 0x00, 0x00
gUnknown_08592058:: @ 8592058
.byte 0xff, 0xff, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x01, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00
gUnknown_08592078:: @ 8592078
.byte 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00
.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00

2
data/scripts/maps/FortreeCity_Gym.inc
View File

@ -4,7 +4,7 @@ FortreeCity_Gym_MapScripts:: @ 82165AB
.byte 0
FortreeCity_Gym_MapScript1_2165B6: @ 82165B6
special sub_80FBE90
special RotatingGate_InitPuzzle
end
FortreeCity_Gym_MapScript2_2165BA: @ 82165BA

2
data/scripts/maps/Route110_TrickHousePuzzle6.inc
View File

@ -4,7 +4,7 @@ Route110_TrickHousePuzzle6_MapScripts:: @ 826DDA7
.byte 0
Route110_TrickHousePuzzle6_MapScript1_26DDB2: @ 826DDB2
special sub_80FBE90
special RotatingGate_InitPuzzle
end
Route110_TrickHousePuzzle6_MapScript2_26DDB6: @ 826DDB6

2
data/specials.inc
View File

@ -212,7 +212,7 @@ gSpecials:: @ 81DBA64
def_special SubtractMoneyFromVar0x8005
def_special sub_80F972C
def_special sp0C8_whiteout_maybe
def_special sub_80FBE90
def_special RotatingGate_InitPuzzle
def_special RotatingGate_InitPuzzleAndGraphics
def_special SetSSTidalFlag
def_special ResetSSTidalFlag

4
ld_script.txt
View File

@ -154,7 +154,7 @@ SECTIONS {
src/pokemon_size_record.o(.text);
asm/fldeff_80F9BCC.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_80FC4F4.o(.text);
src/item_use.o(.text);
@ -450,7 +450,7 @@ SECTIONS {
src/pokemon_size_record.o(.rodata)
data/field_effect_misc.o(.rodata);
data/field_special_scene.o(.rodata);
data/rotating_gate.o(.rodata);
src/rotating_gate.o(.rodata);
data/item_use.o(.rodata);
data/battle_anim_80FE840.o(.rodata);
src/bike.o(.rodata);

5
src/mon_markings.c
View File

@ -9,12 +9,7 @@
#include "sprite.h"
#include "text_window.h"
#ifdef GERMAN
#define MENU_TEXT_SPRITE_X_OFFSET 24
#else
#define MENU_TEXT_SPRITE_X_OFFSET 32
#endif
// static functions
static void sub_811FC80(s16, s16, u16, u16);

1189
src/rotating_gate.c Normal file
View File

File diff suppressed because it is too large Load Diff

10
sym_ewram.txt
View File

@ -522,15 +522,7 @@ gUnknown_0203A018: @ 203A018
gUnknown_0203A034: @ 203A034
.space 0x4
gUnknown_0203A038: @ 203A038
.space 0xC
gUnknown_0203A044: @ 203A044
.space 0x4
gUnknown_0203A048: @ 203A048
.space 0x4
.include "src/rotating_gate.o"
.include "src/safari_zone.o"
gUnknown_0203A0F4: @ 203A0F4