Game-Decompilation/pokeheartgold
1
0
Fork 0
mirror of https://github.com/pret/pokeheartgold.git synced 2025-02-15 02:47:49 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

More splitting

Browse Source
This commit is contained in:
PikalaxALT 2022-01-26 16:43:02 -05:00
parent b1ba152141
commit 94892f74c1
14 changed files with 3915 additions and 3863 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2032
asm/field_use_item.s Normal file
View File

File diff suppressed because it is too large Load Diff

2
asm/macros/script.inc
View File

@ -4562,7 +4562,7 @@
.byte \arg0
.endm
.macro scrcmd_818
.macro mystry_stage_gymmick_init
.short 818
.endm

10
asm/scrcmd.s
View File

@ -868,7 +868,7 @@ gScriptCmdTable:
.word ScrCmd_815 ; 815
.word ScrCmd_UnownCircle ; 816
.word ScrCmd_817 ; 817
.word ScrCmd_818 ; 818
.word ScrCmd_MystriStageGymmickInit ; 818
.word ScrCmd_819 ; 819
.word ScrCmd_820 ; 820
.word ScrCmd_821 ; 821
@ -16244,16 +16244,16 @@ ScrCmd_817: ; 0x02047E64
.balign 4, 0
thumb_func_end ScrCmd_817
thumb_func_start ScrCmd_818
ScrCmd_818: ; 0x02047E7C
thumb_func_start ScrCmd_MystriStageGymmickInit
ScrCmd_MystriStageGymmickInit: ; 0x02047E7C
push {r3, lr}
add r0, #0x80
ldr r0, [r0]
bl sub_0206DCC4
bl Fsys_InitMystriStageGymmick
mov r0, #0
pop {r3, pc}
.balign 4, 0
thumb_func_end ScrCmd_818
thumb_func_end ScrCmd_MystriStageGymmickInit
thumb_func_start ScrCmd_819
ScrCmd_819: ; 0x02047E8C

3854
asm/unk_020632B0.s
View File

File diff suppressed because it is too large Load Diff

131
asm/unk_020648EC.s Normal file
View File

@ -0,0 +1,131 @@
#include "constants/sndseq.h"
#include "constants/species.h"
#include "constants/maps.h"
#include "constants/pokemon.h"
#include "constants/flags.h"
#include "constants/vars.h"
#include "constants/items.h"
#include "constants/std_script.h"
#include "fielddata/script/scr_seq/event_D24R0204.h"
#include "party_menu.h"
.include "asm/macros.inc"
.include "global.inc"
.text
thumb_func_start sub_020648EC
sub_020648EC: ; 0x020648EC
push {r4, lr}
add r4, r0, #0
bl ScriptEnvironment_GetSav2Ptr
bl Sav2_GetGymmickPtr
bl SavGymmick_GetType
add r1, r0, #0
beq _0206490A
lsl r2, r1, #2
ldr r1, _0206490C ; =_020FE214
add r0, r4, #0
ldr r1, [r1, r2]
blx r1
_0206490A:
pop {r4, pc}
.balign 4, 0
_0206490C: .word _020FE214
thumb_func_end sub_020648EC
thumb_func_start sub_02064910
sub_02064910: ; 0x02064910
push {r4, lr}
add r4, r0, #0
bl ScriptEnvironment_GetSav2Ptr
bl Sav2_GetGymmickPtr
bl SavGymmick_GetType
cmp r0, #0
beq _02064932
lsl r1, r0, #2
ldr r0, _02064934 ; =_020FE1EC
ldr r1, [r0, r1]
cmp r1, #0
beq _02064932
add r0, r4, #0
blx r1
_02064932:
pop {r4, pc}
.balign 4, 0
_02064934: .word _020FE1EC
thumb_func_end sub_02064910
thumb_func_start sub_02064938
sub_02064938: ; 0x02064938
push {r3, r4, r5, r6, r7, lr}
sub sp, #8
add r5, r0, #0
add r4, r1, #0
add r7, r2, #0
str r3, [sp, #4]
bl ScriptEnvironment_GetSav2Ptr
bl Sav2_GetGymmickPtr
bl SavGymmick_GetType
cmp r0, #0
bne _0206495A
add sp, #8
mov r0, #0
pop {r3, r4, r5, r6, r7, pc}
_0206495A:
lsl r1, r0, #2
ldr r0, _0206497C ; =_020FE23C
ldr r6, [r0, r1]
cmp r6, #0
beq _02064976
ldr r0, [sp, #0x20]
ldr r3, [sp, #4]
str r0, [sp]
add r0, r5, #0
add r1, r4, #0
add r2, r7, #0
blx r6
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
_02064976:
mov r0, #0
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
.balign 4, 0
_0206497C: .word _020FE23C
thumb_func_end sub_02064938
.rodata
_020FE1EC:
.word 0 ; GYMMICK_NONE
.word ov04_02254D84 ; GYMMICK_ECRUTEAK
.word ov04_02256044 ; GYMMICK_CIANWOOD
.word ov04_022563B0 ; GYMMICK_VERMILION
.word 0 ; GYMMICK_VIOLET
.word ov04_02254710 ; GYMMICK_AZALEA
.word ov04_0225507C ; GYMMICK_BLACKTHORN
.word ov04_022566A0 ; GYMMICK_FUCHSIA
.word ov04_02256BA0 ; GYMMICK_VIRIDIAN
.word ov04_02256EB0 ; GYMMICK_SINJOH
_020FE214:
.word 0 ; GYMMICK_NONE
.word ov04_02254CBC ; GYMMICK_ECRUTEAK
.word ov04_02255FC0 ; GYMMICK_CIANWOOD
.word ov04_02256304 ; GYMMICK_VERMILION
.word ov04_02253E20 ; GYMMICK_VIOLET
.word ov04_02254190 ; GYMMICK_AZALEA
.word ov04_02254F8C ; GYMMICK_BLACKTHORN
.word ov04_02256650 ; GYMMICK_FUCHSIA
.word ov04_02256B64 ; GYMMICK_VIRIDIAN
.word ov04_02256E60 ; GYMMICK_SINJOH
_020FE23C:
.word 0 ; GYMMICK_NONE
.word 0 ; GYMMICK_ECRUTEAK
.word 0 ; GYMMICK_CIANWOOD
.word 0 ; GYMMICK_VERMILION
.word 0 ; GYMMICK_VIOLET
.word 0 ; GYMMICK_AZALEA
.word ov04_022550D4 ; GYMMICK_BLACKTHORN
.word 0 ; GYMMICK_FUCHSIA
.word 0 ; GYMMICK_VIRIDIAN
.word 0 ; GYMMICK_SINJOH

1724
asm/unk_020658D4.s Normal file
View File

File diff suppressed because it is too large Load Diff

6
asm/unk_0206D494.s
View File

@ -1051,8 +1051,8 @@ _0206DCBA:
_0206DCC0: .word 0x00004021
thumb_func_end ScrCmd_807
thumb_func_start sub_0206DCC4
sub_0206DCC4: ; 0x0206DCC4
thumb_func_start Fsys_InitMystriStageGymmick
Fsys_InitMystriStageGymmick: ; 0x0206DCC4
push {r4, lr}
bl ScriptEnvironment_GetSav2Ptr
bl Sav2_GetGymmickPtr
@ -1065,4 +1065,4 @@ sub_0206DCC4: ; 0x0206DCC4
mov r1, #0
str r1, [r0]
pop {r4, pc}
thumb_func_end sub_0206DCC4
thumb_func_end Fsys_InitMystriStageGymmick

2
files/fielddata/script/scr_seq/scr_seq_0131_D51R0201.s
View File

@ -29,7 +29,7 @@ scr_seq_D51R0201_002:
end
_0065:
scrcmd_818
mystry_stage_gymmick_init
end
scr_seq_D51R0201_007:

5
global.inc
View File

@ -2498,7 +2498,7 @@
.public ScrCmd_815
.public ScrCmd_UnownCircle
.public ScrCmd_817
.public ScrCmd_818
.public ScrCmd_MystriStageGymmickInit
.public ScrCmd_819
.public ScrCmd_820
.public ScrCmd_821
@ -29313,7 +29313,7 @@
.public FieldSys_IncrementBugContestTimer
.public sub_0206DB58
.public sub_0206DB94
.public sub_0206DCC4
.public Fsys_InitMystriStageGymmick
.public sub_02070124
.public sub_02070130
.public sub_0207013C
@ -30094,3 +30094,4 @@
.public sub_02066438
.public sub_020623C8
.public sub_020623D8
.public sub_02064518

1
include/gymmick.h
View File

@ -10,6 +10,7 @@
#define GYMMICK_BLACKTHORN 6
#define GYMMICK_FUCHSIA 7
#define GYMMICK_VIRIDIAN 8
#define GYMMICK_SINJOH 9
struct Gymmick {
int kind;

2
include/scrcmd.h
View File

@ -845,7 +845,7 @@ BOOL ScrCmd_814(SCRIPTCONTEXT* ctx);
BOOL ScrCmd_815(SCRIPTCONTEXT* ctx);
BOOL ScrCmd_UnownCircle(SCRIPTCONTEXT* ctx);
BOOL ScrCmd_817(SCRIPTCONTEXT* ctx);
BOOL ScrCmd_818(SCRIPTCONTEXT* ctx);
BOOL ScrCmd_MystriStageGymmickInit(SCRIPTCONTEXT* ctx);
BOOL ScrCmd_819(SCRIPTCONTEXT* ctx);
BOOL ScrCmd_820(SCRIPTCONTEXT* ctx);
BOOL ScrCmd_821(SCRIPTCONTEXT* ctx);

3
main.lsf
View File

@ -215,6 +215,9 @@ Static main
Object unk_02062108.o
Object unk_data_020FDB44.o
Object unk_020632B0.o
Object unk_020648EC.o
Object field_use_item.o
Object unk_020658D4.o
Object sys_flags.o
Object sys_vars.o
Object unk_02066EDC.o

4
src/data/fieldmap/script_cmd_table.h
View File

@ -818,7 +818,7 @@ extern BOOL ScrCmd_814(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_815(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_UnownCircle(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_817(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_818(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_MystriStageGymmickInit(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_819(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_820(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_821(SCRIPTCONTEXT *ctx);
@ -1673,7 +1673,7 @@ const ScrCmdFunc gScriptCmdTable[] = {
ScrCmd_815,
ScrCmd_UnownCircle,
ScrCmd_817,
ScrCmd_818,
ScrCmd_MystriStageGymmickInit,
ScrCmd_819,
ScrCmd_820,
ScrCmd_821,

2
tools/py_scripts/scrcmd.json
View File

@ -5104,7 +5104,7 @@
]
},
{
"name": "scrcmd_818",
"name": "mystry_stage_gymmick_init",
"args": []
},
{