Game-Decompilation/pokeheartgold
1
0
Fork 0
mirror of https://github.com/pret/pokeheartgold.git synced 2025-01-23 13:46:06 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Reformat other data in overlay 53

Browse Source
This commit is contained in:
PikalaxALT 2022-03-15 12:38:02 -04:00
parent d0e7d43181
commit 531c41ad5b
3 changed files with 81 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
asm/overlay_53.s
View File

@ -1,5 +1,6 @@
#include "constants/sndseq.h"
#include "constants/species.h"
#include "msgdata/msg/msg_0219.h"
.include "asm/macros.inc"
.include "global.inc"
@ -620,7 +621,7 @@ ov53_021E5E6C: ; 0x021E5E6C
ldr r3, [r4]
mov r0, #1
mov r1, #0x1b
mov r2, #0xdb
mov r2, #219
bl NewMsgDataFromNarc
mov r1, #1
lsl r1, r1, #8
@ -1242,7 +1243,7 @@ _021E6326: ; jump table
.short _021E6384 - _021E6326 - 2 ; case 2
.short _021E6384 - _021E6326 - 2 ; case 3
_021E632E:
ldr r1, _021E649C ; =_021E84F8
ldr r1, _021E649C ; =ov53_021E84F8
add r0, sp, #0x18
ldrh r3, [r1, #0x28]
add r2, sp, #0x18
@ -1283,7 +1284,7 @@ _021E632E:
bl AddTextPrinterParameterized2
b _021E63E2
_021E6384:
ldr r1, _021E649C ; =_021E84F8
ldr r1, _021E649C ; =ov53_021E84F8
add r0, sp, #0x18
ldrh r2, [r1, #0x30]
cmp r5, #3
@ -1423,7 +1424,7 @@ _021E6490:
pop {r3, r4, r5, r6, r7, pc}
nop
_021E6498: .word 0x0000FFFF
_021E649C: .word _021E84F8
_021E649C: .word ov53_021E84F8
_021E64A0: .word 0x00010200
_021E64A4: .word 0x000F0200
_021E64A8: .word gSystem
@ -2697,7 +2698,7 @@ ov53_021E6E7C: ; 0x021E6E7C
sub sp, #0x1c
add r0, sp, #0xc
add r1, sp, #0
mov r4, #1
mov r4, #msg_0219_00001
bl GF_RTC_CopyDateTime
ldr r0, [sp]
ldr r3, [sp, #4]
@ -2718,7 +2719,7 @@ _021E6EA2:
ldr r1, _021E6EEC ; =0x00000617
cmp r0, r1
bhi _021E6EB2
mov r4, #2
mov r4, #msg_0219_00002
b _021E6EDC
_021E6EB2:
mov r1, #0x19
@ -2728,7 +2729,7 @@ _021E6EB2:
ldr r1, _021E6EF0 ; =0x00000743
cmp r0, r1
bhi _021E6EC4
mov r4, #3
mov r4, #msg_0219_00003
b _021E6EDC
_021E6EC4:
ldr r1, _021E6EF4 ; =0x0000076C
@ -2737,13 +2738,13 @@ _021E6EC4:
ldr r1, _021E6EF8 ; =0x00000937
cmp r0, r1
bhi _021E6ED4
mov r4, #4
mov r4, #msg_0219_00004
b _021E6EDC
_021E6ED4:
ldr r1, _021E6EFC ; =0x00000167
cmp r0, r1
bhi _021E6EDC
mov r4, #5
mov r4, #msg_0219_00005
_021E6EDC:
add r0, r4, #0
add sp, #0x1c
@ -3233,7 +3234,7 @@ _021E72D4:
str r0, [r4, #0xc]
bl _021E7CF8
_021E72F0:
mov r1, #0x19
mov r1, #msg_0219_00025
add r2, r5, #0
bl ov53_021E611C
cmp r0, #1
@ -3308,7 +3309,7 @@ _021E7378:
bl ov53_021E66A8
bl _021E7CF8
_021E739C:
mov r1, #0x1a
mov r1, #msg_0219_00026
mov r2, #1
bl ov53_021E611C
cmp r0, #1
@ -3330,9 +3331,9 @@ _021E73B0:
mov r0, #0x5e
lsl r0, r0, #2
ldr r0, [r4, r0]
mov r1, #0xdb
mov r2, #0x3d
mov r3, #0x3e
mov r1, #219
mov r2, #msg_0219_00061
mov r3, #msg_0219_00062
bl ov53_021E81F4
mov r0, #0x18
str r0, [r4, #0xc]
@ -3637,7 +3638,7 @@ _021E7672:
str r0, [r4, #0xc]
b _021E7CF8
_021E7682:
mov r1, #6
mov r1, #msg_0219_00006
mov r2, #1
bl ov53_021E611C
cmp r0, #1
@ -3658,7 +3659,7 @@ _021E76A2:
str r0, [r4, #0xc]
b _021E7CF8
_021E76A8:
mov r1, #0x22
mov r1, #msg_0219_00034
mov r2, #1
bl ov53_021E611C
cmp r0, #1
@ -3781,7 +3782,7 @@ _021E77AE:
str r0, [r4, #0xc]
b _021E7CF8
_021E77B4:
mov r1, #0x23
mov r1, #msg_0219_00035
mov r2, #1
bl ov53_021E611C
cmp r0, #1
@ -3816,7 +3817,7 @@ _021E77E8:
str r0, [r4, #0xc]
b _021E7CF8
_021E77FA:
mov r1, #0x24
mov r1, #msg_0219_00036
mov r2, #1
bl ov53_021E611C
cmp r0, #1
@ -3831,7 +3832,7 @@ _021E77FA:
strb r1, [r4, r0]
b _021E7CF8
_021E7818:
mov r1, #0x25
mov r1, #msg_0219_00037
mov r2, #1
bl ov53_021E611C
cmp r0, #1
@ -3946,10 +3947,10 @@ _021E78C2:
ldrh r1, [r4, r0]
cmp r1, #0
bne _021E7914
mov r1, #0x26
mov r1, #msg_0219_00038
b _021E7916
_021E7914:
mov r1, #0x27
mov r1, #msg_0219_00039
_021E7916:
add r0, #0x3c
str r1, [r4, r0]
@ -4094,7 +4095,7 @@ _021E7A3C:
str r0, [r4, #0xc]
b _021E7CF8
_021E7A52:
mov r1, #0x28
mov r1, #msg_0219_00040
mov r2, #1
bl ov53_021E611C
cmp r0, #1
@ -4187,12 +4188,12 @@ _021E7AA4:
ldrh r1, [r4, r0]
cmp r1, #0
bne _021E7B28
mov r1, #0x29
mov r1, #msg_0219_00041
add r0, #0x3c
str r1, [r4, r0]
b _021E7CF8
_021E7B28:
mov r1, #0x2a
mov r1, #msg_0219_00042
add r0, #0x3c
str r1, [r4, r0]
b _021E7CF8
@ -4318,7 +4319,7 @@ _021E7C20:
str r0, [r4, #0xc]
b _021E7CF8
_021E7C2E:
mov r1, #0x2b
mov r1, #msg_0219_00043
mov r2, #1
bl ov53_021E611C
cmp r0, #1
@ -5445,36 +5446,50 @@ _021E84F4:
.rodata
_021E84F8:
ov53_021E84F8:
.byte 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00
ov53_021E8500: ; 0x021E8500
.byte 0x00, 0x02, 0x13, 0x1B, 0x04, 0x06, 0x6D, 0x03
.byte 0x00, 0x02, 0x13, 0x1B, 0x04, 0x06
.short 0x036D
ov53_021E8508: ; 0x021E8508
.byte 0x0C, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00
.word 0x0000000C
.word 0x0000000E
ov53_021E8510: ; 0x021E8510
.byte 0x90, 0xBF, 0xA8, 0xFF, 0xFF, 0x00, 0x00, 0x00
ov53_021E8518: ; 0x021E8518
.byte 0x04, 0x18, 0x14, 0x07, 0x02, 0x0E, 0xA3, 0x00
.byte 0x00, 0x04, 0x00, 0x18, 0x18, 0x05, 0x2D, 0x01, 0x00, 0x04, 0x00, 0x18, 0x18, 0x05, 0x2D, 0x01
ov53_021E8520:
.byte 0x00, 0x04, 0x00, 0x18, 0x18, 0x05
.short 0x012D
ov53_021E8528:
.byte 0x00, 0x04, 0x00, 0x18, 0x18, 0x05
.short 0x012D
ov53_021E8530: ; 0x021E8530
.byte 0x19, 0xAD, 0x12, 0x6F, 0x19, 0xAD, 0x90, 0xEF, 0xFF, 0x00, 0x00, 0x00
ov53_021E853C: ; 0x021E853C
.byte 0x00, 0x00, 0xCC, 0xFF, 0xFE, 0xFF
.byte 0xCC, 0xFF, 0x00, 0x00, 0x02, 0x00
.short 0x0000, 0xFFCC, 0xFFFE
.short 0xFFCC, 0x0000, 0x0002
ov53_021E8548: ; 0x021E8548
.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.word 1
.word 0
.word 0
.word 0
ov53_021E8558: ; 0x021E8558
.byte 0x2C, 0x00, 0x00, 0x00, 0x2B, 0x00, 0x00, 0x00
.byte 0x2B, 0x00, 0x00, 0x00, 0x2D, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00
.word 0x2C
.word 0x2B
.word 0x2B
.word 0x2D
.word 0x33
ov53_021E856C: ; 0x021E856C
.byte 0x03, 0x00, 0x00, 0x00
@ -5482,37 +5497,45 @@ ov53_021E856C: ; 0x021E856C
.byte 0x08, 0x00, 0x00, 0x00
ov53_021E8584: ; 0x021E8584
.byte 0x2F, 0x00, 0x00, 0x00, 0x25, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00
.byte 0x25, 0x00, 0x00, 0x00, 0x2E, 0x00, 0x00, 0x00, 0x25, 0x00, 0x00, 0x00
.word 0x2F, 0x25
.word 0x30, 0x25
.word 0x2E, 0x25
ov53_021E859C: ; 0x021E859C
.byte 0x0C, 0x00, 0x00, 0x00
.byte 0x16, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00
.byte 0xFF, 0x00, 0x00, 0x00
.word 0x0C
.word 0x16
.word 0x17
.word 0x18
.word 0x19
.word 0xFF
ov53_021E85B4: ; 0x021E85B4
.byte 0x11, 0x00, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x1B, 0x00, 0x00, 0x00
.byte 0x1C, 0x00, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00
.word 0x11
.word 0x1A
.word 0x1B
.word 0x1C
.word 0x1D
.word 0xFF
ov53_021E85CC: ; 0x021E85CC
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.word 0, 0, 0x800, 0
.byte 1, 0, 0, 0, 0, 1, 0, 0
.word 0
ov53_021E85E8: ; 0x021E85E8
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.word 0, 0, 0x800, 0
.byte 1, 0, 0, 0, 0, 0, 0, 0
.word 0
ov53_021E8604: ; 0x021E8604
.byte 0x00, 0x00, 0x00, 0x00, 0xC7, 0x01, 0x00, 0x00, 0x8F, 0x01, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0xAF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xAF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.word 0, 0x1C7, 0x018F
.word 0, 0x1AF, 0x0000
.word 0, 0x1AF, 0x0000
ov53_021E8628: ; 0x021E8628
.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.word 0x00000001, 0x00000000
.word 0x00000004, 0x00000000, 0x00000002, 0x00000000
.word 0x00000100, 0x00000000, 0x00000000, 0x00000000
ov53_021E8650: ; 0x021E8650
.byte 0x14, 0x32, 0x32, 0xD5, 0x4C, 0x6A, 0x32, 0xD5, 0x84, 0xA2, 0x32, 0xD5, 0xFF, 0x00, 0x00, 0x00

4
asm/unk_02091564.s
View File

@ -92,8 +92,8 @@ sub_020915AC: ; 0x020915AC
.rodata
.public _02106068
_02106068:
.public gApplication_OakSpeech
gApplication_OakSpeech:
.word ov53_OakSpeech_OvyInit, ov53_OakSpeech_OvyExec, ov53_OakSpeech_OvyExit, FS_OVERLAY_ID(OVY_53)
_02106078:

4
src/overlay_36.c
View File

@ -26,7 +26,7 @@
extern const OVY_MGR_TEMPLATE gApplication_NewGameFieldsys;
extern const OVY_MGR_TEMPLATE gApplication_ContinueFieldsys;
extern const OVY_MGR_TEMPLATE _02106068;
extern const OVY_MGR_TEMPLATE gApplication_OakSpeech;
extern void sub_0201838C(IGT* igt);
extern u32 sub_020674BC(SAVEDATA* savedata);
@ -103,7 +103,7 @@ BOOL ov36_TitleScreen_NewGame_AppExec(OVY_MANAGER* man, int* state) {
BOOL ov36_TitleScreen_NewGame_AppExit(OVY_MANAGER* man, int* state) {
#pragma unused(man, state)
DestroyHeap(HEAPID_OV36);
RegisterMainOverlay(FS_OVERLAY_ID_NONE, &_02106068);
RegisterMainOverlay(FS_OVERLAY_ID_NONE, &gApplication_OakSpeech);
return TRUE;
}