summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile4
-rwxr-xr-xasm/berry_crush.s3
-rw-r--r--asm/pokenav_unk_2.s1325
-rw-r--r--include/global.h15
-rw-r--r--include/graphics.h7
-rw-r--r--include/pokenav.h4
-rw-r--r--include/trainer_hill.h2
-rw-r--r--ld_script.txt699
-rw-r--r--src/field_control_avatar.c2
-rw-r--r--src/pokenav_unk_1.c2
-rw-r--r--src/pokenav_unk_2.c842
-rw-r--r--src/trainer_hill.c2
-rw-r--r--src/trainer_see.c2
13 files changed, 1154 insertions, 1755 deletions
diff --git a/Makefile b/Makefile
index 22f9cb452..65a4aa7bd 100644
--- a/Makefile
+++ b/Makefile
@@ -165,6 +165,10 @@ ifeq ($(MODERN),0)
@$(MAKE) tidy MODERN=1
endif
+ifneq ($(MODERN),0)
+$(C_BUILDDIR)/berry_crush.o: override CFLAGS += -Wno-address-of-packed-member
+endif
+
include graphics_file_rules.mk
include map_data_rules.mk
include spritesheet_rules.mk
diff --git a/asm/berry_crush.s b/asm/berry_crush.s
index 2c2b55250..8d44c7269 100755
--- a/asm/berry_crush.s
+++ b/asm/berry_crush.s
@@ -5,9 +5,6 @@
.text
-
-
-
thumb_func_start sub_8021A28
sub_8021A28: @ 8021A28
push {r4-r7,lr}
diff --git a/asm/pokenav_unk_2.s b/asm/pokenav_unk_2.s
index da83ccf55..9ed033295 100644
--- a/asm/pokenav_unk_2.s
+++ b/asm/pokenav_unk_2.s
@@ -5,1331 +5,6 @@
@ File centered around AllocSubstruct(2)
-
- thumb_func_start sub_81C9924
-sub_81C9924: @ 81C9924
- push {lr}
- bl sub_81C9958
- adds r1, r0, 0
- cmp r1, 0
- beq _081C9938
- movs r0, 0
- strb r0, [r1, 0xD]
- movs r0, 0x1
- b _081C993A
-_081C9938:
- movs r0, 0
-_081C993A:
- pop {r1}
- bx r1
- thumb_func_end sub_81C9924
-
- thumb_func_start sub_81C9940
-sub_81C9940: @ 81C9940
- push {lr}
- bl sub_81C9958
- adds r1, r0, 0
- cmp r1, 0
- beq _081C9952
- movs r0, 0x1
- strb r0, [r1, 0xD]
- b _081C9954
-_081C9952:
- movs r0, 0
-_081C9954:
- pop {r1}
- bx r1
- thumb_func_end sub_81C9940
-
- thumb_func_start sub_81C9958
-sub_81C9958: @ 81C9958
- push {r4,lr}
- ldr r1, =0x0000088c
- movs r0, 0x2
- bl AllocSubstruct
- adds r4, r0, 0
- cmp r4, 0
- beq _081C997A
- movs r0, 0
- strb r0, [r4, 0xC]
- ldr r0, =sub_81C9A10
- movs r1, 0x1
- bl CreateLoopedTask
- str r0, [r4, 0x4]
- ldr r0, =sub_81C99FC
- str r0, [r4]
-_081C997A:
- adds r0, r4, 0
- pop {r4}
- pop {r1}
- bx r1
- .pool
- thumb_func_end sub_81C9958
-
- thumb_func_start sub_81C9990
-sub_81C9990: @ 81C9990
- push {r4,r5,lr}
- adds r4, r0, 0
- movs r0, 0x2
- bl GetSubstructPtr
- adds r5, r0, 0
- ldr r0, =gUnknown_086201A0
- lsls r4, 2
- adds r4, r0
- ldr r0, [r4]
- movs r1, 0x1
- bl CreateLoopedTask
- str r0, [r5, 0x4]
- ldr r0, =sub_81C99FC
- str r0, [r5]
- pop {r4,r5}
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_81C9990
-
- thumb_func_start sub_81C99C0
-sub_81C99C0: @ 81C99C0
- push {lr}
- movs r0, 0x2
- bl GetSubstructPtr
- ldr r0, [r0]
- bl _call_via_r0
- pop {r1}
- bx r1
- thumb_func_end sub_81C99C0
-
- thumb_func_start sub_81C99D4
-sub_81C99D4: @ 81C99D4
- push {r4,lr}
- movs r0, 0x2
- bl GetSubstructPtr
- adds r4, r0, 0
- bl sub_81CA7F4
- ldrb r0, [r4, 0x8]
- bl RemoveWindow
- bl sub_81C9FEC
- bl sub_81CA994
- movs r0, 0x2
- bl FreePokenavSubstruct
- pop {r4}
- pop {r0}
- bx r0
- thumb_func_end sub_81C99D4
-
- thumb_func_start sub_81C99FC
-sub_81C99FC: @ 81C99FC
- push {lr}
- movs r0, 0x2
- bl GetSubstructPtr
- ldr r0, [r0, 0x4]
- bl IsLoopedTaskActive
- pop {r1}
- bx r1
- thumb_func_end sub_81C99FC
-
- thumb_func_start sub_81C9A10
-sub_81C9A10: @ 81C9A10
- push {r4,r5,lr}
- sub sp, 0x4
- adds r4, r0, 0
- movs r0, 0x2
- bl GetSubstructPtr
- adds r5, r0, 0
- cmp r4, 0x9
- bls _081C9A24
- b _081C9C60
-_081C9A24:
- lsls r0, r4, 2
- ldr r1, =_081C9A34
- adds r0, r1
- ldr r0, [r0]
- mov pc, r0
- .pool
- .align 2, 0
-_081C9A34:
- .4byte _081C9A5C
- .4byte _081C9AEC
- .4byte _081C9B30
- .4byte _081C9B88
- .4byte _081C9B9E
- .4byte _081C9BA4
- .4byte _081C9BB6
- .4byte _081C9BC0
- .4byte _081C9C0E
- .4byte _081C9C4C
-_081C9A5C:
- ldr r0, =gUnknown_08620194
- movs r1, 0x3
- bl InitBgTemplates
- ldr r1, =gPokenavMessageBox_Gfx
- movs r0, 0
- str r0, [sp]
- movs r0, 0x1
- movs r2, 0
- movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
- adds r1, r5, 0
- adds r1, 0x8C
- movs r0, 0x1
- bl SetBgTilemapBuffer
- ldr r1, =gPokenavMessageBox_Tilemap
- movs r0, 0x1
- movs r2, 0
- movs r3, 0
- bl CopyToBgTilemapBuffer
- movs r0, 0x1
- bl CopyBgTilemapBufferToVram
- ldr r0, =gPokenavMessageBox_Pal
- movs r1, 0x10
- movs r2, 0x20
- bl CopyPaletteIntoBufferUnfaded
- movs r0, 0x1
- movs r1, 0
- movs r2, 0
- bl ChangeBgX
- movs r0, 0x1
- movs r1, 0
- movs r2, 0
- bl ChangeBgY
- movs r0, 0x2
- movs r1, 0
- movs r2, 0
- bl ChangeBgX
- movs r0, 0x2
- movs r1, 0
- movs r2, 0
- bl ChangeBgY
- movs r0, 0x3
- movs r1, 0
- movs r2, 0
- bl ChangeBgX
- movs r0, 0x3
- movs r1, 0
- movs r2, 0
- bl ChangeBgY
-_081C9AD6:
- movs r0, 0
- b _081C9C62
- .pool
-_081C9AEC:
- bl free_temp_tile_data_buffers_if_possible
- lsls r0, 24
- lsrs r0, 24
- cmp r0, 0
- beq _081C9AFA
- b _081C9C5C
-_081C9AFA:
- ldr r1, =gUnknown_0861FD6C
- str r0, [sp]
- movs r0, 0x2
- movs r2, 0
- movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
- ldr r1, =gUnknown_0861FFF4
- movs r0, 0x1
- str r0, [sp]
- movs r0, 0x2
- movs r2, 0
- movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
- ldr r0, =gUnknown_0861FD4C
- movs r1, 0x20
- movs r2, 0x20
- bl CopyPaletteIntoBufferUnfaded
- b _081C9AD6
- .pool
-_081C9B30:
- bl free_temp_tile_data_buffers_if_possible
- lsls r0, 24
- lsrs r0, 24
- cmp r0, 0
- beq _081C9B3E
- b _081C9C5C
-_081C9B3E:
- ldr r1, =gUnknown_0861FC98
- str r0, [sp]
- movs r0, 0x3
- movs r2, 0
- movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
- ldr r1, =gUnknown_0861FCAC
- movs r0, 0x1
- str r0, [sp]
- movs r0, 0x3
- movs r2, 0
- movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
- ldr r0, =gUnknown_0861FC78
- movs r1, 0x30
- movs r2, 0x20
- bl CopyPaletteIntoBufferUnfaded
- bl sub_81C9894
- cmp r0, 0x3
- beq _081C9B76
- bl sub_81C9894
- cmp r0, 0x4
- bne _081C9AD6
-_081C9B76:
- bl sub_81CA850
- b _081C9AD6
- .pool
-_081C9B88:
- bl free_temp_tile_data_buffers_if_possible
- lsls r0, 24
- cmp r0, 0
- bne _081C9C5C
- bl sub_81CA6E0
- bl sub_81CA7D4
-_081C9B9A:
- movs r0, 0x1
- b _081C9C62
-_081C9B9E:
- bl sub_81C9FC4
- b _081C9B9A
-_081C9BA4:
- bl sub_81CA714
- bl sub_81CA02C
- bl sub_81CA640
- bl sub_81CA0C8
- b _081C9AD6
-_081C9BB6:
- bl sub_81CA7C4
- cmp r0, 0
- bne _081C9C5C
- b _081C9B9A
-_081C9BC0:
- movs r0, 0x1
- bl ShowBg
- movs r0, 0x2
- bl ShowBg
- movs r0, 0x3
- bl ShowBg
- ldrb r0, [r5, 0xD]
- cmp r0, 0
- beq _081C9BE0
- movs r0, 0x1
- bl sub_81C7AC0
- b _081C9BEC
-_081C9BE0:
- movs r0, 0x6E
- bl PlaySE
- movs r0, 0x3
- bl sub_81C7AC0
-_081C9BEC:
- bl sub_81C9894
- cmp r0, 0x3
- beq _081C9BFE
- cmp r0, 0x4
- bne _081C9C06
- movs r0, 0x7
- bl LoadLeftHeaderGfxForIndex
-_081C9BFE:
- movs r0, 0x1
- bl LoadLeftHeaderGfxForIndex
- b _081C9AD6
-_081C9C06:
- movs r0, 0
- bl LoadLeftHeaderGfxForIndex
- b _081C9AD6
-_081C9C0E:
- bl IsPaletteFadeActive
- cmp r0, 0
- bne _081C9C5C
- bl sub_81C9894
- cmp r0, 0x3
- beq _081C9C2C
- cmp r0, 0x4
- bne _081C9C38
- movs r0, 0x7
- movs r1, 0
- movs r2, 0
- bl sub_81C7FA0
-_081C9C2C:
- movs r0, 0x1
- movs r1, 0
- movs r2, 0
- bl sub_81C7FA0
- b _081C9C42
-_081C9C38:
- movs r0, 0
- movs r1, 0
- movs r2, 0
- bl sub_81C7FA0
-_081C9C42:
- bl sub_81CA20C
- bl titlescreen_0
- b _081C9B9A
-_081C9C4C:
- bl sub_81CA324
- cmp r0, 0
- bne _081C9C5C
- bl sub_81C8010
- cmp r0, 0
- beq _081C9C60
-_081C9C5C:
- movs r0, 0x2
- b _081C9C62
-_081C9C60:
- movs r0, 0x4
-_081C9C62:
- add sp, 0x4
- pop {r4,r5}
- pop {r1}
- bx r1
- thumb_func_end sub_81C9A10
-
- thumb_func_start sub_81C9C6C
-sub_81C9C6C: @ 81C9C6C
- push {lr}
- cmp r0, 0
- beq _081C9C78
- cmp r0, 0x1
- beq _081C9C8E
- b _081C9CA2
-_081C9C78:
- bl sub_81CAA3C
- bl sub_81CA278
- bl sub_81CA714
- movs r0, 0x5
- bl PlaySE
- movs r0, 0
- b _081C9CA4
-_081C9C8E:
- bl sub_81CA324
- cmp r0, 0
- bne _081C9C9E
- bl sub_81CA7C4
- cmp r0, 0
- beq _081C9CA2
-_081C9C9E:
- movs r0, 0x2
- b _081C9CA4
-_081C9CA2:
- movs r0, 0x4
-_081C9CA4:
- pop {r1}
- bx r1
- thumb_func_end sub_81C9C6C
-
- thumb_func_start sub_81C9CA8
-sub_81C9CA8: @ 81C9CA8
- push {lr}
- cmp r0, 0x1
- beq _081C9CDC
- cmp r0, 0x1
- bgt _081C9CB8
- cmp r0, 0
- beq _081C9CC2
- b _081C9D3C
-_081C9CB8:
- cmp r0, 0x2
- beq _081C9CFA
- cmp r0, 0x3
- beq _081C9D14
- b _081C9D3C
-_081C9CC2:
- bl sub_81CA9C8
- bl sub_81CA2DC
- movs r0, 0
- movs r1, 0
- bl sub_81C7FC4
- movs r0, 0x5
- bl PlaySE
- movs r0, 0
- b _081C9D3E
-_081C9CDC:
- bl sub_81CA324
- cmp r0, 0
- bne _081C9D34
- bl sub_81C8010
- cmp r0, 0
- bne _081C9D34
- bl sub_81CA0C8
- movs r0, 0x1
- bl LoadLeftHeaderGfxForIndex
- movs r0, 0
- b _081C9D3E
-_081C9CFA:
- bl sub_81CA20C
- movs r0, 0x1
- movs r1, 0
- movs r2, 0
- bl sub_81C7FA0
- bl sub_81CA818
- bl sub_81CA714
- movs r0, 0
- b _081C9D3E
-_081C9D14:
- bl sub_81CA324
- cmp r0, 0
- bne _081C9D34
- bl sub_81C8010
- cmp r0, 0
- bne _081C9D34
- bl sub_81CA89C
- cmp r0, 0
- bne _081C9D34
- bl sub_81CA7C4
- cmp r0, 0
- beq _081C9D38
-_081C9D34:
- movs r0, 0x2
- b _081C9D3E
-_081C9D38:
- bl sub_81CA9D8
-_081C9D3C:
- movs r0, 0x4
-_081C9D3E:
- pop {r1}
- bx r1
- thumb_func_end sub_81C9CA8
-
- thumb_func_start sub_81C9D44
-sub_81C9D44: @ 81C9D44
- push {lr}
- cmp r0, 0x1
- beq _081C9D72
- cmp r0, 0x1
- bgt _081C9D54
- cmp r0, 0
- beq _081C9D5E
- b _081C9DD2
-_081C9D54:
- cmp r0, 0x2
- beq _081C9D90
- cmp r0, 0x3
- beq _081C9DAA
- b _081C9DD2
-_081C9D5E:
- bl sub_81CA9C8
- bl sub_81CA2DC
- movs r0, 0x1
- movs r1, 0
- bl sub_81C7FC4
- movs r0, 0
- b _081C9DD4
-_081C9D72:
- bl sub_81CA324
- cmp r0, 0
- bne _081C9DCA
- bl sub_81C8010
- cmp r0, 0
- bne _081C9DCA
- bl sub_81CA0C8
- movs r0, 0
- bl LoadLeftHeaderGfxForIndex
- movs r0, 0
- b _081C9DD4
-_081C9D90:
- bl sub_81CA20C
- movs r0, 0
- movs r1, 0
- movs r2, 0
- bl sub_81C7FA0
- bl sub_81CA864
- bl sub_81CA714
- movs r0, 0
- b _081C9DD4
-_081C9DAA:
- bl sub_81CA324
- cmp r0, 0
- bne _081C9DCA
- bl sub_81C8010
- cmp r0, 0
- bne _081C9DCA
- bl sub_81CA89C
- cmp r0, 0
- bne _081C9DCA
- bl sub_81CA7C4
- cmp r0, 0
- beq _081C9DCE
-_081C9DCA:
- movs r0, 0x2
- b _081C9DD4
-_081C9DCE:
- bl sub_81CA9D8
-_081C9DD2:
- movs r0, 0x4
-_081C9DD4:
- pop {r1}
- bx r1
- thumb_func_end sub_81C9D44
-
- thumb_func_start sub_81C9DD8
-sub_81C9DD8: @ 81C9DD8
- push {lr}
- cmp r0, 0x1
- beq _081C9E04
- cmp r0, 0x1
- bgt _081C9DE8
- cmp r0, 0
- beq _081C9DF2
- b _081C9E50
-_081C9DE8:
- cmp r0, 0x2
- beq _081C9E1A
- cmp r0, 0x3
- beq _081C9E30
- b _081C9E50
-_081C9DF2:
- bl sub_81CA9C8
- bl sub_81CA2DC
- movs r0, 0x5
- bl PlaySE
- movs r0, 0
- b _081C9E52
-_081C9E04:
- bl sub_81CA324
- cmp r0, 0
- bne _081C9E48
- movs r0, 0x7
- bl LoadLeftHeaderGfxForIndex
- bl sub_81CA0C8
- movs r0, 0
- b _081C9E52
-_081C9E1A:
- bl sub_81CA20C
- movs r0, 0x7
- movs r1, 0
- movs r2, 0
- bl sub_81C7FA0
- bl sub_81CA714
- movs r0, 0
- b _081C9E52
-_081C9E30:
- bl sub_81CA324
- cmp r0, 0
- bne _081C9E48
- bl sub_81C8010
- cmp r0, 0
- bne _081C9E48
- bl sub_81CA89C
- cmp r0, 0
- beq _081C9E4C
-_081C9E48:
- movs r0, 0x2
- b _081C9E52
-_081C9E4C:
- bl sub_81CA9D8
-_081C9E50:
- movs r0, 0x4
-_081C9E52:
- pop {r1}
- bx r1
- thumb_func_end sub_81C9DD8
-
- thumb_func_start sub_81C9E58
-sub_81C9E58: @ 81C9E58
- push {lr}
- cmp r0, 0x1
- beq _081C9E86
- cmp r0, 0x1
- bgt _081C9E68
- cmp r0, 0
- beq _081C9E72
- b _081C9EC2
-_081C9E68:
- cmp r0, 0x2
- beq _081C9E9E
- cmp r0, 0x3
- beq _081C9EAA
- b _081C9EC2
-_081C9E72:
- bl sub_81CA9C8
- bl sub_81CA2DC
- movs r0, 0x7
- movs r1, 0
- bl sub_81C7FC4
- movs r0, 0
- b _081C9EC4
-_081C9E86:
- bl sub_81CA324
- cmp r0, 0
- bne _081C9EBA
- bl sub_81C8010
- cmp r0, 0
- bne _081C9EBA
- bl sub_81CA0C8
- movs r0, 0
- b _081C9EC4
-_081C9E9E:
- bl sub_81CA20C
- bl sub_81CA714
- movs r0, 0
- b _081C9EC4
-_081C9EAA:
- bl sub_81CA324
- cmp r0, 0
- bne _081C9EBA
- bl sub_81CA89C
- cmp r0, 0
- beq _081C9EBE
-_081C9EBA:
- movs r0, 0x2
- b _081C9EC4
-_081C9EBE:
- bl sub_81CA9D8
-_081C9EC2:
- movs r0, 0x4
-_081C9EC4:
- pop {r1}
- bx r1
- thumb_func_end sub_81C9E58
-
- thumb_func_start sub_81C9EC8
-sub_81C9EC8: @ 81C9EC8
- push {lr}
- cmp r0, 0
- beq _081C9ED4
- cmp r0, 0x1
- beq _081C9EE2
- b _081C9EF0
-_081C9ED4:
- movs r0, 0x20
- bl PlaySE
- bl sub_81CA770
- movs r0, 0
- b _081C9EF2
-_081C9EE2:
- bl IsDma3ManagerBusyWithBgCopy
- lsls r0, 24
- cmp r0, 0
- beq _081C9EF0
- movs r0, 0x2
- b _081C9EF2
-_081C9EF0:
- movs r0, 0x4
-_081C9EF2:
- pop {r1}
- bx r1
- thumb_func_end sub_81C9EC8
-
- thumb_func_start sub_81C9EF8
-sub_81C9EF8: @ 81C9EF8
- push {lr}
- cmp r0, 0
- beq _081C9F04
- cmp r0, 0x1
- beq _081C9F12
- b _081C9F20
-_081C9F04:
- movs r0, 0x5
- bl PlaySE
- bl sub_81CA714
- movs r0, 0
- b _081C9F22
-_081C9F12:
- bl IsDma3ManagerBusyWithBgCopy
- lsls r0, 24
- cmp r0, 0
- beq _081C9F20
- movs r0, 0x2
- b _081C9F22
-_081C9F20:
- movs r0, 0x4
-_081C9F22:
- pop {r1}
- bx r1
- thumb_func_end sub_81C9EF8
-
- thumb_func_start sub_81C9F28
-sub_81C9F28: @ 81C9F28
- push {lr}
- cmp r0, 0x1
- beq _081C9F52
- cmp r0, 0x1
- bgt _081C9F38
- cmp r0, 0
- beq _081C9F42
- b _081C9FBC
-_081C9F38:
- cmp r0, 0x2
- beq _081C9F96
- cmp r0, 0x3
- beq _081C9FB0
- b _081C9FBC
-_081C9F42:
- bl sub_81C98C4
- lsls r0, 16
- lsrs r0, 16
- bl sub_81C7BA4
- movs r0, 0
- b _081C9FBE
-_081C9F52:
- bl IsDma3ManagerBusyWithBgCopy_
- cmp r0, 0
- bne _081C9FB8
- bl sub_81C7880
- bl sub_81CA9C8
- bl sub_81CA2DC
- bl sub_81C9894
- cmp r0, 0x3
- beq _081C9F7A
- cmp r0, 0x4
- bne _081C9F84
- movs r0, 0x7
- movs r1, 0
- bl sub_81C7FC4
-_081C9F7A:
- movs r0, 0x1
- movs r1, 0
- bl sub_81C7FC4
- b _081C9F8C
-_081C9F84:
- movs r0, 0
- movs r1, 0
- bl sub_81C7FC4
-_081C9F8C:
- movs r0, 0x5
- bl PlaySE
- movs r0, 0
- b _081C9FBE
-_081C9F96:
- bl sub_81CA324
- cmp r0, 0
- bne _081C9FB8
- bl sub_81C8010
- cmp r0, 0
- bne _081C9FB8
- movs r0, 0
- bl sub_81C7AC0
- movs r0, 0
- b _081C9FBE
-_081C9FB0:
- bl IsPaletteFadeActive
- cmp r0, 0
- beq _081C9FBC
-_081C9FB8:
- movs r0, 0x2
- b _081C9FBE
-_081C9FBC:
- movs r0, 0x4
-_081C9FBE:
- pop {r1}
- bx r1
- thumb_func_end sub_81C9F28
-
- thumb_func_start sub_81C9FC4
-sub_81C9FC4: @ 81C9FC4
- push {r4,r5,lr}
- movs r5, 0
- ldr r4, =gUnknown_086201C4
-_081C9FCA:
- adds r0, r4, 0
- bl LoadCompressedSpriteSheet
- adds r4, 0x8
- adds r5, 0x1
- cmp r5, 0x1
- bls _081C9FCA
- ldr r0, =gUnknown_086201D4
- bl Pokenav_AllocAndLoadPalettes
- pop {r4,r5}
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_81C9FC4
-
- thumb_func_start sub_81C9FEC
-sub_81C9FEC: @ 81C9FEC
- push {lr}
- movs r0, 0x3
- bl FreeSpriteTilesByTag
- movs r0, 0x1
- bl FreeSpriteTilesByTag
- movs r0, 0x4
- bl FreeSpritePaletteByTag
- movs r0, 0x5
- bl FreeSpritePaletteByTag
- movs r0, 0x6
- bl FreeSpritePaletteByTag
- movs r0, 0x7
- bl FreeSpritePaletteByTag
- movs r0, 0x8
- bl FreeSpritePaletteByTag
- movs r0, 0x3
- bl FreeSpritePaletteByTag
- bl sub_81CA094
- bl sub_81CA698
- pop {r0}
- bx r0
- thumb_func_end sub_81C9FEC
-
- thumb_func_start sub_81CA02C
-sub_81CA02C: @ 81CA02C
- push {r4-r7,lr}
- mov r7, r8
- push {r7}
- movs r0, 0x2
- bl GetSubstructPtr
- movs r2, 0
- adds r0, 0x2C
- mov r8, r0
-_081CA03E:
- movs r4, 0
- lsls r0, r2, 2
- lsls r1, r2, 4
- adds r7, r2, 0x1
- adds r0, r2
- lsls r0, 18
- movs r2, 0xA0
- lsls r2, 14
- adds r5, r0, r2
- mov r0, r8
- adds r6, r1, r0
-_081CA054:
- ldr r0, =gUnknown_0862034C
- movs r1, 0x8C
- asrs r2, r5, 16
- movs r3, 0x3
- bl CreateSprite
- lsls r0, 24
- lsrs r0, 24
- lsls r1, r0, 4
- adds r1, r0
- lsls r1, 2
- ldr r0, =gSprites
- adds r1, r0
- stm r6!, {r1}
- lsls r0, r4, 5
- strh r0, [r1, 0x24]
- adds r4, 0x1
- cmp r4, 0x3
- ble _081CA054
- adds r2, r7, 0
- cmp r2, 0x5
- ble _081CA03E
- pop {r3}
- mov r8, r3
- pop {r4-r7}
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_81CA02C
-
- thumb_func_start sub_81CA094
-sub_81CA094: @ 81CA094
- push {r4-r7,lr}
- movs r0, 0x2
- bl GetSubstructPtr
- movs r1, 0
- adds r7, r0, 0
- adds r7, 0x2C
-_081CA0A2:
- lsls r0, r1, 4
- adds r6, r1, 0x1
- adds r4, r0, r7
- movs r5, 0x3
-_081CA0AA:
- ldr r0, [r4]
- bl FreeSpriteOamMatrix
- ldm r4!, {r0}
- bl DestroySprite
- subs r5, 0x1
- cmp r5, 0
- bge _081CA0AA
- adds r1, r6, 0
- cmp r1, 0x5
- ble _081CA0A2
- pop {r4-r7}
- pop {r0}
- bx r0
- thumb_func_end sub_81CA094
-
- thumb_func_start sub_81CA0C8
-sub_81CA0C8: @ 81CA0C8
- push {lr}
- bl sub_81C9894
- lsls r2, r0, 3
- subs r2, r0
- lsls r2, 2
- ldr r1, =gUnknown_08620240+4
- adds r0, r2, r1
- subs r1, 0x4
- adds r2, r1
- ldrh r1, [r2]
- ldrh r2, [r2, 0x2]
- bl sub_81CA0EC
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_81CA0C8
-
- thumb_func_start sub_81CA0EC
-sub_81CA0EC: @ 81CA0EC
- push {r4-r7,lr}
- mov r7, r10
- mov r6, r9
- mov r5, r8
- push {r5-r7}
- sub sp, 0x18
- adds r6, r0, 0
- str r1, [sp, 0x14]
- str r2, [sp]
- movs r0, 0x2
- bl GetSubstructPtr
- mov r10, r0
- movs r0, 0x3
- bl GetSpriteTileStartByTag
- lsls r0, 16
- lsrs r0, 16
- str r0, [sp, 0x4]
- movs r1, 0
-_081CA114:
- ldr r0, [r6]
- cmp r0, 0
- beq _081CA1B0
- movs r5, 0
- lsls r2, r1, 4
- mov r0, r10
- adds r0, 0x2C
- lsls r3, r1, 2
- mov r9, r3
- movs r4, 0x10
- add r4, r10
- mov r8, r4
- adds r7, r6, 0x4
- str r7, [sp, 0xC]
- ldr r3, [sp, 0x14]
- ldr r4, [sp]
- adds r3, r4
- str r3, [sp, 0x8]
- adds r1, 0x1
- str r1, [sp, 0x10]
- adds r4, r2, r0
-_081CA13E:
- ldr r3, [r4]
- ldr r0, [r6]
- ldrh r2, [r0]
- ldr r7, [sp, 0x4]
- adds r2, r7
- lsls r0, r5, 3
- adds r2, r0
- ldr r1, =0x000003ff
- adds r0, r1, 0
- ands r2, r0
- ldrh r0, [r3, 0x4]
- ldr r7, =0xfffffc00
- adds r1, r7, 0
- ands r0, r1
- orrs r0, r2
- strh r0, [r3, 0x4]
- ldr r0, [r6]
- ldrh r0, [r0, 0x2]
- adds r0, 0x4
- lsls r0, 16
- lsrs r0, 16
- bl IndexOfSpritePaletteTag
- ldr r3, [r4]
- lsls r0, 4
- ldrb r2, [r3, 0x5]
- movs r1, 0xF
- ands r1, r2
- orrs r1, r0
- strb r1, [r3, 0x5]
- ldr r2, [r4]
- adds r2, 0x3E
- ldrb r0, [r2]
- movs r1, 0x4
- orrs r0, r1
- strb r0, [r2]
- ldr r0, [r4]
- mov r1, sp
- ldrh r1, [r1, 0x14]
- strh r1, [r0, 0x22]
- ldr r1, [r4]
- movs r0, 0x8C
- strh r0, [r1, 0x20]
- ldm r4!, {r1}
- lsls r0, r5, 5
- strh r0, [r1, 0x24]
- adds r5, 0x1
- cmp r5, 0x3
- ble _081CA13E
- mov r1, r8
- add r1, r9
- movs r0, 0x1
- b _081CA1EC
- .pool
-_081CA1B0:
- lsls r2, r1, 4
- mov r0, r10
- adds r0, 0x2C
- lsls r3, r1, 2
- mov r9, r3
- movs r4, 0x10
- add r4, r10
- mov r8, r4
- adds r6, 0x4
- str r6, [sp, 0xC]
- ldr r7, [sp, 0x14]
- ldr r3, [sp]
- adds r7, r3
- str r7, [sp, 0x8]
- adds r1, 0x1
- str r1, [sp, 0x10]
- movs r3, 0x4
- adds r2, r0
- movs r5, 0x3
-_081CA1D6:
- ldm r2!, {r1}
- adds r1, 0x3E
- ldrb r0, [r1]
- orrs r0, r3
- strb r0, [r1]
- subs r5, 0x1
- cmp r5, 0
- bge _081CA1D6
- mov r1, r8
- add r1, r9
- movs r0, 0
-_081CA1EC:
- str r0, [r1]
- ldr r6, [sp, 0xC]
- ldr r4, [sp, 0x8]
- str r4, [sp, 0x14]
- ldr r1, [sp, 0x10]
- cmp r1, 0x5
- ble _081CA114
- add sp, 0x18
- pop {r3-r5}
- mov r8, r3
- mov r9, r4
- mov r10, r5
- pop {r4-r7}
- pop {r0}
- bx r0
- thumb_func_end sub_81CA0EC
-
- thumb_func_start sub_81CA20C
-sub_81CA20C: @ 81CA20C
- push {r4-r7,lr}
- mov r7, r8
- push {r7}
- movs r0, 0x2
- bl GetSubstructPtr
- adds r6, r0, 0
- bl sub_81C98A4
- mov r8, r0
- movs r7, 0
- movs r5, 0
- adds r4, r6, 0
- adds r4, 0x2C
-_081CA228:
- lsls r0, r5, 2
- adds r1, r6, 0
- adds r1, 0x10
- adds r1, r0
- ldr r0, [r1]
- cmp r0, 0
- beq _081CA25C
- adds r0, r7, 0
- adds r7, 0x1
- cmp r0, r8
- bne _081CA244
- movs r2, 0x82
- strb r5, [r6, 0xB]
- b _081CA246
-_081CA244:
- movs r2, 0x8C
-_081CA246:
- adds r0, r4, 0
- movs r1, 0x80
- lsls r1, 1
- movs r3, 0xC
- bl sub_81CA35C
- adds r0, r4, 0
- movs r1, 0
- bl sub_81CA448
- b _081CA264
-_081CA25C:
- adds r0, r4, 0
- movs r1, 0x1
- bl sub_81CA448
-_081CA264:
- adds r4, 0x10
- adds r5, 0x1
- cmp r5, 0x5
- ble _081CA228
- pop {r3}
- mov r8, r3
- pop {r4-r7}
- pop {r0}
- bx r0
- thumb_func_end sub_81CA20C
-
- thumb_func_start sub_81CA278
-sub_81CA278: @ 81CA278
- push {r4,r5,lr}
- movs r0, 0x2
- bl GetSubstructPtr
- adds r4, r0, 0
- bl sub_81C98A4
- adds r3, r0, 0
- movs r2, 0
- movs r5, 0
- ldr r0, [r4, 0x10]
- cmp r0, 0
- beq _081CA298
- cmp r5, r3
- beq _081CA2B2
-_081CA296:
- adds r5, 0x1
-_081CA298:
- adds r2, 0x1
- cmp r2, 0x5
- bgt _081CA2B2
- lsls r0, r2, 2
- adds r1, r4, 0
- adds r1, 0x10
- adds r1, r0
- ldr r0, [r1]
- cmp r0, 0
- beq _081CA298
- cmp r5, r3
- bne _081CA296
- adds r5, r2, 0
-_081CA2B2:
- ldrb r0, [r4, 0xB]
- lsls r0, 4
- adds r0, 0x2C
- adds r0, r4, r0
- movs r1, 0x82
- movs r2, 0x8C
- movs r3, 0x4
- bl sub_81CA35C
- lsls r0, r5, 4
- adds r0, 0x2C
- adds r0, r4, r0
- movs r1, 0x8C
- movs r2, 0x82
- movs r3, 0x4
- bl sub_81CA35C
- strb r5, [r4, 0xB]
- pop {r4,r5}
- pop {r0}
- bx r0
- thumb_func_end sub_81CA278
-
- thumb_func_start sub_81CA2DC
-sub_81CA2DC: @ 81CA2DC
- push {r4-r6,lr}
- movs r0, 0x2
- bl GetSubstructPtr
- adds r6, r0, 0
- movs r5, 0
- adds r4, r6, 0
- adds r4, 0x2C
-_081CA2EC:
- lsls r0, r5, 2
- adds r1, r6, 0
- adds r1, 0x10
- adds r1, r0
- ldr r0, [r1]
- cmp r0, 0
- beq _081CA316
- ldrb r0, [r6, 0xB]
- cmp r0, r5
- beq _081CA310
- adds r0, r4, 0
- movs r1, 0x8C
- movs r2, 0x80
- lsls r2, 1
- movs r3, 0x8
- bl sub_81CA35C
- b _081CA316
-_081CA310:
- adds r0, r4, 0
- bl sub_81CA3B4
-_081CA316:
- adds r4, 0x10
- adds r5, 0x1
- cmp r5, 0x5
- ble _081CA2EC
- pop {r4-r6}
- pop {r0}
- bx r0
- thumb_func_end sub_81CA2DC
-
- thumb_func_start sub_81CA324
-sub_81CA324: @ 81CA324
- push {r4,lr}
- movs r0, 0x2
- bl GetSubstructPtr
- adds r3, r0, 0
- movs r2, 0
- ldr r4, =SpriteCallbackDummy
- adds r1, r3, 0
- adds r1, 0x2C
-_081CA336:
- ldr r0, [r1]
- ldr r0, [r0, 0x1C]
- cmp r0, r4
- bne _081CA354
- adds r1, 0x10
- adds r2, 0x1
- cmp r2, 0x5
- ble _081CA336
- ldrb r0, [r3, 0xC]
- cmp r0, 0
- bne _081CA354
- movs r0, 0
- b _081CA356
- .pool
-_081CA354:
- movs r0, 0x1
-_081CA356:
- pop {r4}
- pop {r1}
- bx r1
- thumb_func_end sub_81CA324
-
- thumb_func_start sub_81CA35C
-sub_81CA35C: @ 81CA35C
- push {r4-r7,lr}
- mov r7, r9
- mov r6, r8
- push {r6,r7}
- adds r4, r0, 0
- adds r5, r1, 0
- mov r9, r2
- adds r6, r3, 0
- ldr r0, =sub_81CA474
- mov r8, r0
- subs r0, r2, r5
- lsls r0, 4
- adds r1, r6, 0
- bl __divsi3
- adds r3, r0, 0
- movs r1, 0x3
- lsls r2, r5, 4
-_081CA380:
- ldr r0, [r4]
- strh r5, [r0, 0x20]
- ldr r0, [r4]
- strh r6, [r0, 0x2E]
- ldr r0, [r4]
- strh r3, [r0, 0x30]
- ldr r0, [r4]
- strh r2, [r0, 0x32]
- ldr r0, [r4]
- mov r7, r9
- strh r7, [r0, 0x3C]
- ldm r4!, {r0}
- mov r7, r8
- str r7, [r0, 0x1C]
- subs r1, 0x1
- cmp r1, 0
- bge _081CA380
- pop {r3,r4}
- mov r8, r3
- mov r9, r4
- pop {r4-r7}
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_81CA35C
-
thumb_func_start sub_81CA3B4
sub_81CA3B4: @ 81CA3B4
push {r4-r7,lr}
diff --git a/include/global.h b/include/global.h
index eb18682e9..16f08c895 100644
--- a/include/global.h
+++ b/include/global.h
@@ -19,12 +19,15 @@
#if defined (__APPLE__) || defined (__CYGWIN__) || defined (_MSC_VER)
#define _(x) x
#define __(x) x
-#define INCBIN_U8 {0}
-#define INCBIN_U16 {0}
-#define INCBIN_U32 {0}
-#define INCBIN_S8 {0}
-#define INCBIN_S16 {0}
-#define INCBIN_S32 {0}
+
+// Fool CLion IDE
+#define INCBIN(x) {0}
+#define INCBIN_U8 INCBIN
+#define INCBIN_U16 INCBIN
+#define INCBIN_U32 INCBIN
+#define INCBIN_S8 INCBIN
+#define INCBIN_S16 INCBIN
+#define INCBIN_S32 INCBIN
#endif // IDE support
#define ARRAY_COUNT(array) (size_t)(sizeof(array) / sizeof((array)[0]))
diff --git a/include/graphics.h b/include/graphics.h
index c39ad60b0..d1d99cc8f 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4950,4 +4950,11 @@ extern const u16 gUsePokeblockCondition_Pal[];
extern const u32 gUnknown_08DE34B8[];
extern const u16 gUnknown_08DE3398[];
+// Pokenav
+extern const u32 gPokenavMessageBox_Gfx[];
+extern const u32 gPokenavMessageBox_Tilemap[];
+extern const u16 gPokenavMessageBox_Pal[];
+extern const u32 gPokenavOptions_Gfx[];
+extern const u16 gPokenavOptions_Pal[];
+
#endif //GUARD_GRAPHICS_H
diff --git a/include/pokenav.h b/include/pokenav.h
index 380e61dda..ecf66de51 100644
--- a/include/pokenav.h
+++ b/include/pokenav.h
@@ -138,6 +138,8 @@ void sub_81C7B40(void);
struct Sprite *PauseSpinningPokenavSprite(void);
void ResumeSpinningPokenavSprite(void);
void sub_81C7E14(u32 arg0);
+void sub_81C7FC4(u32 arg0, bool32 arg1);
+void sub_81C7880(void);
void sub_81C7990(u32 a0, u16 a1);
// pokenav_unk_1.c
@@ -150,6 +152,8 @@ u32 sub_81C941C(void);
void sub_81C9430(void);
int sub_81C9894(void);
const u8 *sub_81CAF78(int index, u8 *arg1);
+u16 sub_81C98C4(void);
+int sub_81C98A4(void);
// pokenav_unk_2.c
void sub_81C99D4(void);
diff --git a/include/trainer_hill.h b/include/trainer_hill.h
index ad2713316..e605ac654 100644
--- a/include/trainer_hill.h
+++ b/include/trainer_hill.h
@@ -24,7 +24,7 @@ const struct WarpEvent* sub_81D6134(u8 warpEventId);
u16 LocalIdToHillTrainerId(u8 localId);
bool8 GetHillTrainerFlag(u8 eventObjectId);
void SetHillTrainerFlag(void);
-const u8 *sub_81D62AC(void);
+const u8 *GetTrainerHillTrainerScript(void);
void FillHillTrainerParty(void);
void FillHillTrainersParties(void);
u32 sub_81D63C4(void);
diff --git a/ld_script.txt b/ld_script.txt
index f820a920e..769df23f8 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -47,291 +47,291 @@ SECTIONS {
.text :
ALIGN(4)
{
- asm/crt0.o(.text*);
- src/main.o(.text*);
- src/alloc.o(.text*);
- src/dma3_manager.o(.text*);
- src/gpu_regs.o(.text*);
- src/bg.o(.text*);
- src/blit.o(.text*);
- src/window.o(.text*);
- src/text.o(.text*);
- src/sprite.o(.text*);
- src/string_util.o(.text*);
- src/link.o(.text*);
- src/link_rfu.o(.text*);
- src/union_room.o(.text*);
- src/mystery_gift.o(.text*);
- src/union_room_player_avatar.o(.text*);
- src/union_room_battle.o(.text*);
- src/mevent2.o(.text*);
- src/mevent_801BAAC.o(.text*);
- src/mevent_server.o(.text*);
- src/mevent_client.o(.text*);
- src/mevent_server_helpers.o(.text*);
- src/mevent_news.o(.text*);
- src/union_room_chat.o(.text*);
- src/berry_crush.o(.text*);
- asm/berry_crush.o(.text*);
- src/berry_powder.o(.text*);
- src/dodrio_berry_picking.o(.text*);
- src/pokemon_jump.o(.text*);
- src/rtc.o(.text*);
- src/main_menu.o(.text*);
- src/battle_controllers.o(.text*);
- src/decompress.o(.text*);
- src/rom_8034C54.o(.text*);
- src/battle_bg.o(.text*);
- src/battle_main.o(.text*);
- src/battle_util.o(.text*);
- src/battle_script_commands.o(.text*);
- src/battle_util2.o(.text*);
- src/battle_controller_player.o(.text*);
- src/battle_gfx_sfx_util.o(.text*);
- src/battle_controller_opponent.o(.text*);
- src/battle_ai_switch_items.o(.text*);
- src/battle_controller_link_opponent.o(.text*);
- src/pokemon.o(.text*);
- src/trig.o(.text*);
- src/random.o(.text*);
- src/util.o(.text*);
- src/daycare.o(.text*);
- src/egg_hatch.o(.text*);
- src/battle_interface.o(.text*);
- src/smokescreen.o(.text*);
- src/pokeball.o(.text*);
- src/load_save.o(.text*);
- src/trade.o(.text*);
- src/berry_blender.o(.text*);
- src/play_time.o(.text*);
- src/new_game.o(.text*);
- src/overworld.o(.text*);
- src/fieldmap.o(.text*);
- src/metatile_behavior.o(.text*);
- src/field_camera.o(.text*);
- src/field_door.o(.text*);
- src/field_player_avatar.o(.text*);
- src/event_object_movement.o(.text*);
- src/field_message_box.o(.text*);
- src/event_obj_lock.o(.text*);
- src/text_window.o(.text*);
- src/script.o(.text*);
- src/scrcmd.o(.text*);
- src/field_control_avatar.o(.text*);
- src/event_data.o(.text*);
- src/coord_event_weather.o(.text*);
- src/field_tasks.o(.text*);
- src/clock.o(.text*);
- src/reset_rtc_screen.o(.text*);
- src/start_menu.o(.text*);
- src/tileset_anims.o(.text*);
- src/palette.o(.text*);
- src/sound.o(.text*);
- src/battle_anim.o(.text*);
- src/battle_anim_mons.o(.text*);
- src/task.o(.text*);
- src/reshow_battle_screen.o(.text*);
- src/battle_anim_status_effects.o(.text*);
- src/title_screen.o(.text*);
- src/field_weather.o(.text*);
- src/field_weather_effect.o(.text*);
- src/field_screen_effect.o(.text*);
- src/battle_setup.o(.text*);
- src/cable_club.o(.text*);
- src/trainer_see.o(.text*);
- src/wild_encounter.o(.text*);
- src/field_effect.o(.text*);
- src/scanline_effect.o(.text*);
- src/option_menu.o(.text*);
- src/pokedex.o(.text*);
- src/trainer_card.o(.text*);
- src/frontier_pass.o(.text*);
- src/pokemon_storage_system.o(.text*);
- src/pokemon_icon.o(.text*);
- src/script_movement.o(.text*);
- src/fldeff_cut.o(.text*);
- src/mail_data.o(.text*);
- src/map_name_popup.o(.text*);
- src/item_menu_icons.o(.text*);
- src/battle_anim_mon_movement.o(.text*);
- src/item.o(.text*);
- src/contest.o(.text*);
- src/shop.o(.text*);
- src/fldeff_escalator.o(.text*);
- src/berry.o(.text*);
- src/script_menu.o(.text*);
- src/naming_screen.o(.text*);
- src/money.o(.text*);
- src/contest_effect.o(.text*);
- src/record_mixing.o(.text*);
- src/secret_base.o(.text*);
- src/tv.o(.text*);
- src/contest_link_80F57C4.o(.text*);
- src/script_pokemon_util_80F87D8.o(.text*);
- src/field_poison.o(.text*);
- src/pokemon_size_record.o(.text*);
- src/fldeff_misc.o(.text*);
- src/field_special_scene.o(.text*);
- src/rotating_gate.o(.text*);
- src/safari_zone.o(.text*);
- src/contest_link_80FC4F4.o(.text*);
- src/item_use.o(.text*);
- src/battle_anim_effects_1.o(.text*);
- src/battle_anim_effects_2.o(.text*);
- src/water.o(.text*);
- src/fire.o(.text*);
- src/electric.o(.text*);
- src/ice.o(.text*);
- src/fight.o(.text*);
- src/poison.o(.text*);
- src/flying.o(.text*);
- src/psychic.o(.text*);
- src/bug.o(.text*);
- src/rock.o(.text*);
- src/ghost.o(.text*);
- src/dragon.o(.text*);
- src/dark.o(.text*);
- src/ground.o(.text*);
- src/normal.o(.text*);
- src/battle_anim_utility_funcs.o(.text*);
- src/battle_intro.o(.text*);
- src/bike.o(.text*);
- src/easy_chat.o(.text*);
- src/mon_markings.o(.text*);
- src/mauville_old_man.o(.text*);
- src/mail.o(.text*);
- src/menu_helpers.o(.text*);
- src/dewford_trend.o(.text*);
- src/heal_location.o(.text*);
- src/region_map.o(.text*);
- src/contest_painting_effects.o(.text*);
- src/decoration.o(.text*);
- src/slot_machine.o(.text*);
- src/contest_painting.o(.text*);
- src/battle_ai_script_commands.o(.text*);
- src/trader.o(.text*);
- src/starter_choose.o(.text*);
- src/wallclock.o(.text*);
- src/fldeff_rocksmash.o(.text*);
- src/fldeff_dig.o(.text*);
- src/pokeblock.o(.text*);
- src/fldeff_flash.o(.text*);
- src/post_battle_event_funcs.o(.text*);
- src/time_events.o(.text*);
- src/birch_pc.o(.text*);
- src/hof_pc.o(.text*);
- src/field_specials.o(.text*);
- src/battle_records.o(.text*);
- src/pokedex_area_screen.o(.text*);
- src/evolution_scene.o(.text*);
- src/roulette.o(.text*);
- src/pokedex_cry_screen.o(.text*);
- src/coins.o(.text*);
- src/landmark.o(.text*);
- src/fldeff_strength.o(.text*);
- src/battle_transition.o(.text*);
- src/battle_controller_link_partner.o(.text*);
- src/battle_message.o(.text*);
- src/cable_car.o(.text*);
- src/math_util.o(.text*);
- src/roulette_util.o(.text*);
- src/rom_81520A8.o(.text*);
- src/save.o(.text*);
- src/mystery_event_script.o(.text*);
- src/field_effect_helpers.o(.text*);
- src/contest_ai.o(.text*);
- src/battle_anim_sound_tasks.o(.text*);
- src/battle_controller_safari.o(.text*);
- src/fldeff_sweetscent.o(.text*);
- src/battle_anim_effects_3.o(.text*);
- src/move_relearner.o(.text*);
- src/fldeff_softboiled.o(.text*);
- src/decoration_inventory.o(.text*);
- src/roamer.o(.text*);
- src/battle_tower.o(.text*);
- src/use_pokeblock.o(.text*);
- src/battle_controller_wally.o(.text*);
- src/player_pc.o(.text*);
- src/intro.o(.text*);
- src/reset_save_heap.o(.text*);
- src/field_region_map.o(.text*);
- src/battle_anim_special.o(.text*);
- src/hall_of_fame.o(.text*);
- src/credits.o(.text*);
- src/lottery_corner.o(.text*);
- src/diploma.o(.text*);
- src/berry_tag_screen.o(.text*);
- src/mystery_event_menu.o(.text*);
- src/save_failed_screen.o(.text*);
- src/braille_puzzles.o(.text*);
- src/pokeblock_feed.o(.text*);
- src/clear_save_data_screen.o(.text*);
- src/intro_credits_graphics.o(.text*);
- src/evolution_graphics.o(.text*);
- src/bard_music.o(.text*);
- src/fldeff_teleport.o(.text*);
- src/battle_tv.o(.text*);
- src/pokemon_animation.o(.text*);
- src/recorded_battle.o(.text*);
- src/battle_controller_recorded_opponent.o(.text*);
- src/battle_controller_recorded_player.o(.text*);
- src/trainer_pokemon_sprites.o(.text*);
- src/lilycove_lady.o(.text*);
- src/battle_dome.o(.text*);
- src/battle_palace.o(.text*);
- src/match_call.o(.text*);
- src/menu.o(.text*);
- src/battle_factory_screen.o(.text*);
- src/apprentice.o(.text*);
- src/frontier_util.o(.text*);
- src/battle_arena.o(.text*);
- src/battle_factory.o(.text*);
- src/battle_pike.o(.text*);
- src/mossdeep_gym.o(.text*);
- src/battle_pyramid.o(.text*);
- src/item_menu.o(.text*);
- src/list_menu.o(.text*);
- src/dynamic_placeholder_text_util.o(.text*);
- src/save_location.o(.text*);
- src/item_icon.o(.text*);
- src/party_menu.o(.text*);
- src/battle_tent.o(.text*);
- src/unk_text_util_2.o(.text*);
- src/multiboot.o(.text*);
- src/unk_81BAD84.o(.text*);
- src/battle_controller_player_partner.o(.text*);
- src/mirage_tower.o(.text*);
- src/berry_fix_program.o(.text*);
- src/pokemon_summary_screen.o(.text*);
- src/unk_pokedex_area_screen_helper.o(.text*);
- src/battle_pyramid_bag.o(.text*);
- src/pokenav.o(.text*);
- src/pokenav_main_menu.o(.text*);
- src/pokenav_match_call_ui.o(.text*);
- src/pokenav_unk_1.o(.text*);
- src/pokenav_unk_2.o(.text*);
- asm/pokenav_unk_2.o(.text*);
- src/pokenav_unk_3.o(.text*);
- src/pokenav_unk_4.o(.text*);
- src/pokenav_unk_5.o(.text*);
- src/pokenav_unk_6.o(.text*);
- src/pokenav_unk_7.o(.text*);
- src/pokenav_unk_8.o(.text*);
- asm/pokenav_unk_8.o(.text*);
- asm/pokenav_unk_9.o(.text*);
- src/pokenav_unk_10.o(.text*);
- src/pokenav_match_call_data.o(.text*);
- src/menu_specialized.o(.text*);
- src/ereader_helpers.o(.text*);
- src/faraway_island.o(.text*);
- src/ereader_screen.o(.text*);
- src/trainer_hill.o(.text*);
- src/rayquaza_scene.o(.text*);
- src/walda_phrase.o(.text*);
- src/contest_link_81D9DE4.o(.text*);
- src/gym_leader_rematch.o(.text*);
- src/unk_transition.o(.text*);
- src/international_string_util.o(.text*);
+ asm/crt0.o(.text);
+ src/main.o(.text);
+ src/alloc.o(.text);
+ src/dma3_manager.o(.text);
+ src/gpu_regs.o(.text);
+ src/bg.o(.text);
+ src/blit.o(.text);
+ src/window.o(.text);
+ src/text.o(.text);
+ src/sprite.o(.text);
+ src/string_util.o(.text);
+ src/link.o(.text);
+ src/link_rfu.o(.text);
+ src/union_room.o(.text);
+ src/mystery_gift.o(.text);
+ src/union_room_player_avatar.o(.text);
+ src/union_room_battle.o(.text);
+ src/mevent2.o(.text);
+ src/mevent_801BAAC.o(.text);
+ src/mevent_server.o(.text);
+ src/mevent_client.o(.text);
+ src/mevent_server_helpers.o(.text);
+ src/mevent_news.o(.text);
+ src/union_room_chat.o(.text);
+ src/berry_crush.o(.text);
+ asm/berry_crush.o(.text);
+ src/berry_powder.o(.text);
+ src/dodrio_berry_picking.o(.text);
+ src/pokemon_jump.o(.text);
+ src/rtc.o(.text);
+ src/main_menu.o(.text);
+ src/battle_controllers.o(.text);
+ src/decompress.o(.text);
+ src/rom_8034C54.o(.text);
+ src/battle_bg.o(.text);
+ src/battle_main.o(.text);
+ src/battle_util.o(.text);
+ src/battle_script_commands.o(.text);
+ src/battle_util2.o(.text);
+ src/battle_controller_player.o(.text);
+ src/battle_gfx_sfx_util.o(.text);
+ src/battle_controller_opponent.o(.text);
+ src/battle_ai_switch_items.o(.text);
+ src/battle_controller_link_opponent.o(.text);
+ src/pokemon.o(.text);
+ src/trig.o(.text);
+ src/random.o(.text);
+ src/util.o(.text);
+ src/daycare.o(.text);
+ src/egg_hatch.o(.text);
+ src/battle_interface.o(.text);
+ src/smokescreen.o(.text);
+ src/pokeball.o(.text);
+ src/load_save.o(.text);
+ src/trade.o(.text);
+ src/berry_blender.o(.text);
+ src/play_time.o(.text);
+ src/new_game.o(.text);
+ src/overworld.o(.text);
+ src/fieldmap.o(.text);
+ src/metatile_behavior.o(.text);
+ src/field_camera.o(.text);
+ src/field_door.o(.text);
+ src/field_player_avatar.o(.text);
+ src/event_object_movement.o(.text);
+ src/field_message_box.o(.text);
+ src/event_obj_lock.o(.text);
+ src/text_window.o(.text);
+ src/script.o(.text);
+ src/scrcmd.o(.text);
+ src/field_control_avatar.o(.text);
+ src/event_data.o(.text);
+ src/coord_event_weather.o(.text);
+ src/field_tasks.o(.text);
+ src/clock.o(.text);
+ src/reset_rtc_screen.o(.text);
+ src/start_menu.o(.text);
+ src/tileset_anims.o(.text);
+ src/palette.o(.text);
+ src/sound.o(.text);
+ src/battle_anim.o(.text);
+ src/battle_anim_mons.o(.text);
+ src/task.o(.text);
+ src/reshow_battle_screen.o(.text);
+ src/battle_anim_status_effects.o(.text);
+ src/title_screen.o(.text);
+ src/field_weather.o(.text);
+ src/field_weather_effect.o(.text);
+ src/field_screen_effect.o(.text);
+ src/battle_setup.o(.text);
+ src/cable_club.o(.text);
+ src/trainer_see.o(.text);
+ src/wild_encounter.o(.text);
+ src/field_effect.o(.text);
+ src/scanline_effect.o(.text);
+ src/option_menu.o(.text);
+ src/pokedex.o(.text);
+ src/trainer_card.o(.text);
+ src/frontier_pass.o(.text);
+ src/pokemon_storage_system.o(.text);
+ src/pokemon_icon.o(.text);
+ src/script_movement.o(.text);
+ src/fldeff_cut.o(.text);
+ src/mail_data.o(.text);
+ src/map_name_popup.o(.text);
+ src/item_menu_icons.o(.text);
+ src/battle_anim_mon_movement.o(.text);
+ src/item.o(.text);
+ src/contest.o(.text);
+ src/shop.o(.text);
+ src/fldeff_escalator.o(.text);
+ src/berry.o(.text);
+ src/script_menu.o(.text);
+ src/naming_screen.o(.text);
+ src/money.o(.text);
+ src/contest_effect.o(.text);
+ src/record_mixing.o(.text);
+ src/secret_base.o(.text);
+ src/tv.o(.text);
+ src/contest_link_80F57C4.o(.text);
+ src/script_pokemon_util_80F87D8.o(.text);
+ src/field_poison.o(.text);
+ src/pokemon_size_record.o(.text);
+ src/fldeff_misc.o(.text);
+ src/field_special_scene.o(.text);
+ src/rotating_gate.o(.text);
+ src/safari_zone.o(.text);
+ src/contest_link_80FC4F4.o(.text);
+ src/item_use.o(.text);
+ src/battle_anim_effects_1.o(.text);
+ src/battle_anim_effects_2.o(.text);
+ src/water.o(.text);
+ src/fire.o(.text);
+ src/electric.o(.text);
+ src/ice.o(.text);
+ src/fight.o(.text);
+ src/poison.o(.text);
+ src/flying.o(.text);
+ src/psychic.o(.text);
+ src/bug.o(.text);
+ src/rock.o(.text);
+ src/ghost.o(.text);
+ src/dragon.o(.text);
+ src/dark.o(.text);
+ src/ground.o(.text);
+ src/normal.o(.text);
+ src/battle_anim_utility_funcs.o(.text);
+ src/battle_intro.o(.text);
+ src/bike.o(.text);
+ src/easy_chat.o(.text);
+ src/mon_markings.o(.text);
+ src/mauville_old_man.o(.text);
+ src/mail.o(.text);
+ src/menu_helpers.o(.text);
+ src/dewford_trend.o(.text);
+ src/heal_location.o(.text);
+ src/region_map.o(.text);
+ src/contest_painting_effects.o(.text);
+ src/decoration.o(.text);
+ src/slot_machine.o(.text);
+ src/contest_painting.o(.text);
+ src/battle_ai_script_commands.o(.text);
+ src/trader.o(.text);
+ src/starter_choose.o(.text);
+ src/wallclock.o(.text);
+ src/fldeff_rocksmash.o(.text);
+ src/fldeff_dig.o(.text);
+ src/pokeblock.o(.text);
+ src/fldeff_flash.o(.text);
+ src/post_battle_event_funcs.o(.text);
+ src/time_events.o(.text);
+ src/birch_pc.o(.text);
+ src/hof_pc.o(.text);
+ src/field_specials.o(.text);
+ src/battle_records.o(.text);
+ src/pokedex_area_screen.o(.text);
+ src/evolution_scene.o(.text);
+ src/roulette.o(.text);
+ src/pokedex_cry_screen.o(.text);
+ src/coins.o(.text);
+ src/landmark.o(.text);
+ src/fldeff_strength.o(.text);
+ src/battle_transition.o(.text);
+ src/battle_controller_link_partner.o(.text);
+ src/battle_message.o(.text);
+ src/cable_car.o(.text);
+ src/math_util.o(.text);
+ src/roulette_util.o(.text);
+ src/rom_81520A8.o(.text);
+ src/save.o(.text);
+ src/mystery_event_script.o(.text);
+ src/field_effect_helpers.o(.text);
+ src/contest_ai.o(.text);
+ src/battle_anim_sound_tasks.o(.text);
+ src/battle_controller_safari.o(.text);
+ src/fldeff_sweetscent.o(.text);
+ src/battle_anim_effects_3.o(.text);
+ src/move_relearner.o(.text);
+ src/fldeff_softboiled.o(.text);
+ src/decoration_inventory.o(.text);
+ src/roamer.o(.text);
+ src/battle_tower.o(.text);
+ src/use_pokeblock.o(.text);
+ src/battle_controller_wally.o(.text);
+ src/player_pc.o(.text);
+ src/intro.o(.text);
+ src/reset_save_heap.o(.text);
+ src/field_region_map.o(.text);
+ src/battle_anim_special.o(.text);
+ src/hall_of_fame.o(.text);
+ src/credits.o(.text);
+ src/lottery_corner.o(.text);
+ src/diploma.o(.text);
+ src/berry_tag_screen.o(.text);
+ src/mystery_event_menu.o(.text);
+ src/save_failed_screen.o(.text);
+ src/braille_puzzles.o(.text);
+ src/pokeblock_feed.o(.text);
+ src/clear_save_data_screen.o(.text);
+ src/intro_credits_graphics.o(.text);
+ src/evolution_graphics.o(.text);
+ src/bard_music.o(.text);
+ src/fldeff_teleport.o(.text);
+ src/battle_tv.o(.text);
+ src/pokemon_animation.o(.text);
+ src/recorded_battle.o(.text);
+ src/battle_controller_recorded_opponent.o(.text);
+ src/battle_controller_recorded_player.o(.text);
+ src/trainer_pokemon_sprites.o(.text);
+ src/lilycove_lady.o(.text);
+ src/battle_dome.o(.text);
+ src/battle_palace.o(.text);
+ src/match_call.o(.text);
+ src/menu.o(.text);
+ src/battle_factory_screen.o(.text);
+ src/apprentice.o(.text);
+ src/frontier_util.o(.text);
+ src/battle_arena.o(.text);
+ src/battle_factory.o(.text);
+ src/battle_pike.o(.text);
+ src/mossdeep_gym.o(.text);
+ src/battle_pyramid.o(.text);
+ src/item_menu.o(.text);
+ src/list_menu.o(.text);
+ src/dynamic_placeholder_text_util.o(.text);
+ src/save_location.o(.text);
+ src/item_icon.o(.text);
+ src/party_menu.o(.text);
+ src/battle_tent.o(.text);
+ src/unk_text_util_2.o(.text);
+ src/multiboot.o(.text);
+ src/unk_81BAD84.o(.text);
+ src/battle_controller_player_partner.o(.text);
+ src/mirage_tower.o(.text);
+ src/berry_fix_program.o(.text);
+ src/pokemon_summary_screen.o(.text);
+ src/unk_pokedex_area_screen_helper.o(.text);
+ src/battle_pyramid_bag.o(.text);
+ src/pokenav.o(.text);
+ src/pokenav_main_menu.o(.text);
+ src/pokenav_match_call_ui.o(.text);
+ src/pokenav_unk_1.o(.text);
+ src/pokenav_unk_2.o(.text);
+ asm/pokenav_unk_2.o(.text);
+ src/pokenav_unk_3.o(.text);
+ src/pokenav_unk_4.o(.text);
+ src/pokenav_unk_5.o(.text);
+ src/pokenav_unk_6.o(.text);
+ src/pokenav_unk_7.o(.text);
+ src/pokenav_unk_8.o(.text);
+ asm/pokenav_unk_8.o(.text);
+ asm/pokenav_unk_9.o(.text);
+ src/pokenav_unk_10.o(.text);
+ src/pokenav_match_call_data.o(.text);
+ src/menu_specialized.o(.text);
+ src/ereader_helpers.o(.text);
+ src/faraway_island.o(.text);
+ src/ereader_screen.o(.text);
+ src/trainer_hill.o(.text);
+ src/rayquaza_scene.o(.text);
+ src/walda_phrase.o(.text);
+ src/contest_link_81D9DE4.o(.text);
+ src/gym_leader_rematch.o(.text);
+ src/unk_transition.o(.text);
+ src/international_string_util.o(.text);
} =0
script_data :
@@ -350,71 +350,70 @@ SECTIONS {
lib_text :
ALIGN(4)
{
- asm/libgcnmultiboot.o(.text*);
- asm/m4a_1.o(.text*);
- src/m4a.o(.text*);
- src/agb_flash.o(.text*);
- src/agb_flash_1m.o(.text*);
- src/agb_flash_mx.o(.text*);
- src/siirtc.o(.text*);
- src/librfu_stwi.o(.text*);
- src/librfu_intr.o(.text*);
- asm/librfu_intr.o(.text*);
- src/librfu_rfu.o(.text*);
- src/librfu.o(.text*);
- asm/librfu.o(.text*);
- asm/libagbsyscall.o(.text*);
- *libgcc.a:_call_via_rX.o(.text*);
- *libgcc.a:_divdi3.o(.text*);
- *libgcc.a:_divsi3.o(.text*);
- *libgcc.a:_dvmd_tls.o(.text*);
- *libgcc.a:_fixunsdfsi.o(.text*);
- *libgcc.a:_fixunssfsi.o(.text*);
- *libgcc.a:_modsi3.o(.text*);
- *libgcc.a:_muldi3.o(.text*);
- *libgcc.a:_udivdi3.o(.text*);
- *libgcc.a:_udivsi3.o(.text*);
- *libgcc.a:_umodsi3.o(.text*);
- *libgcc.a:dp-bit.o(.text*);
- *libgcc.a:fp-bit.o(.text*);
- *libgcc.a:_lshrdi3.o(.text*);
- *libgcc.a:_negdi2.o(.text*);
- *libc.a:memcpy.o(.text*);
- *libc.a:memset.o(.text*);
- *libc.a:strcmp.o(.text*);
- *libc.a:strcpy.o(.text*);
- *libc.a:vfprintf.o(.text*);
- *libc.a:vsprintf.o(.text*);
- *libc.a:fvwrite.o(.text*);
- *libc.a:locale.o(.text*);
- *libc.a:findfp.o(.text*);
- *libc.a:fflush.o(.text*);
- *libc.a:wsetup.o(.text*);
- *libc.a:mbtowc_r.o(.text*);
- *libc.a:s_isinf.o(.text*);
- *libc.a:s_isnan.o(.text*);
- *libc.a:memchr.o(.text*);
- *libc.a:strlen.o(.text*);
- *libc.a:dtoa.o(.text*);
- *libc.a:memmove.o(.text*);
- *libc.a:stdio.o(.text*);
- *libc.a:mprec.o(.text*);
- *libc.a:mallocr.o(.text*);
- *libc.a:fwalk.o(.text*);
- *libc.a:freer.o(.text*);
- *libc.a:makebuf.o(.text*);
- *libc.a:readr.o(.text*);
- *libc.a:writer.o(.text*);
- *libc.a:lseekr.o(.text*);
- *libc.a:closer.o(.text*);
- *libc.a:callocr.o(.text*);
- *libc.a:sbrkr.o(.text*);
- *libc.a:mlock.o(.text*);
- *libc.a:fstatr.o(.text*);
- *libc.a:libcfunc.o(.text*);
- *libc.a:syscalls.o(.text*);
- *libc.a:errno.o(.text*);
- src/libisagbprn.o(.text*);
+ asm/libgcnmultiboot.o(.text);
+ asm/m4a_1.o(.text);
+ src/m4a.o(.text);
+ src/agb_flash.o(.text);
+ src/agb_flash_1m.o(.text);
+ src/agb_flash_mx.o(.text);
+ src/siirtc.o(.text);
+ src/librfu_stwi.o(.text);
+ src/librfu_intr.o(.text);
+ asm/librfu_intr.o(.text);
+ src/librfu_rfu.o(.text);
+ asm/librfu.o(.text);
+ asm/libagbsyscall.o(.text);
+ *libgcc.a:_call_via_rX.o(.text);
+ *libgcc.a:_divdi3.o(.text);
+ *libgcc.a:_divsi3.o(.text);
+ *libgcc.a:_dvmd_tls.o(.text);
+ *libgcc.a:_fixunsdfsi.o(.text);
+ *libgcc.a:_fixunssfsi.o(.text);
+ *libgcc.a:_modsi3.o(.text);
+ *libgcc.a:_muldi3.o(.text);
+ *libgcc.a:_udivdi3.o(.text);
+ *libgcc.a:_udivsi3.o(.text);
+ *libgcc.a:_umodsi3.o(.text);
+ *libgcc.a:dp-bit.o(.text);
+ *libgcc.a:fp-bit.o(.text);
+ *libgcc.a:_lshrdi3.o(.text);
+ *libgcc.a:_negdi2.o(.text);
+ *libc.a:memcpy.o(.text);
+ *libc.a:memset.o(.text);
+ *libc.a:strcmp.o(.text);
+ *libc.a:strcpy.o(.text);
+ *libc.a:vfprintf.o(.text);
+ *libc.a:vsprintf.o(.text);
+ *libc.a:fvwrite.o(.text);
+ *libc.a:locale.o(.text);
+ *libc.a:findfp.o(.text);
+ *libc.a:fflush.o(.text);
+ *libc.a:wsetup.o(.text);
+ *libc.a:mbtowc_r.o(.text);
+ *libc.a:s_isinf.o(.text);
+ *libc.a:s_isnan.o(.text);
+ *libc.a:memchr.o(.text);
+ *libc.a:strlen.o(.text);
+ *libc.a:dtoa.o(.text);
+ *libc.a:memmove.o(.text);
+ *libc.a:stdio.o(.text);
+ *libc.a:mprec.o(.text);
+ *libc.a:mallocr.o(.text);
+ *libc.a:fwalk.o(.text);
+ *libc.a:freer.o(.text);
+ *libc.a:makebuf.o(.text);
+ *libc.a:readr.o(.text);
+ *libc.a:writer.o(.text);
+ *libc.a:lseekr.o(.text);
+ *libc.a:closer.o(.text);
+ *libc.a:callocr.o(.text);
+ *libc.a:sbrkr.o(.text);
+ *libc.a:mlock.o(.text);
+ *libc.a:fstatr.o(.text);
+ *libc.a:libcfunc.o(.text);
+ *libc.a:syscalls.o(.text);
+ *libc.a:errno.o(.text);
+ src/libisagbprn.o(.text);
} =0
.rodata :
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index 455c38deb..8a41087f5 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -304,7 +304,7 @@ static const u8 *GetInteractedEventObjectScript(struct MapPosition *position, u8
gSpecialVar_Facing = direction;
if (InTrainerHill() == TRUE)
- script = sub_81D62AC();
+ script = GetTrainerHillTrainerScript();
else
script = GetEventObjectScriptPointerByEventObjectId(eventObjectId);
diff --git a/src/pokenav_unk_1.c b/src/pokenav_unk_1.c
index 96ecf9c8b..336cf49f2 100644
--- a/src/pokenav_unk_1.c
+++ b/src/pokenav_unk_1.c
@@ -459,7 +459,7 @@ int sub_81C98B4(void)
return state->descriptionId;
}
-int sub_81C98C4(void)
+u16 sub_81C98C4(void)
{
struct Pokenav1Struct *state = GetSubstructPtr(1);
return state->helpBarIndex;
diff --git a/src/pokenav_unk_2.c b/src/pokenav_unk_2.c
index 60aa5ea5e..ae15eabfb 100644
--- a/src/pokenav_unk_2.c
+++ b/src/pokenav_unk_2.c
@@ -1,11 +1,78 @@
#include "global.h"
+#include "alloc.h"
+#include "decompress.h"
#include "bg.h"
-#include "gym_leader_rematch.h"
+#include "menu.h"
+#include "window.h"
#include "pokenav.h"
-#include "sprite.h"
+#include "graphics.h"
+#include "sound.h"
+#include "gym_leader_rematch.h"
#include "window.h"
#include "strings.h"
#include "scanline_effect.h"
+#include "constants/songs.h"
+
+// Match Call
+
+struct Pokenav2Struct
+{
+ bool32 (*callback)(void);
+ u32 loopedTaskId;
+ u8 field_008;
+ u8 field_009;
+ u8 field_00a;
+ u8 field_00b;
+ u8 field_00c;
+ u8 field_00d;
+ bool32 field_010[6];
+ u8 filler_028[4];
+ struct Sprite * field_02c[6][4];
+ u8 field_08c[0x800];
+};
+
+struct Pokenav2Struct * sub_81C9958(void);
+bool32 sub_81C99FC(void);
+u32 sub_81C9A10(s32 state);
+u32 sub_81C9C6C(s32 state);
+u32 sub_81C9CA8(s32 state);
+u32 sub_81C9D44(s32 state);
+u32 sub_81C9DD8(s32 state);
+u32 sub_81C9E58(s32 state);
+u32 sub_81C9EC8(s32 state);
+u32 sub_81C9EF8(s32 state);
+u32 sub_81C9F28(s32 state);
+void sub_81C9FC4(void);
+void sub_81C9FEC(void);
+void sub_81CA02C(void);
+void sub_81CA094(void);
+void sub_81CA0C8(void);
+void sub_81CA0EC(const u16 *const * a0, s32 a1, s32 a2);
+void sub_81CA20C(void);
+void sub_81CA278(void);
+void sub_81CA35C(struct Sprite ** sprites, s32 a1, s32 a2, s32 a3);
+void sub_81CA3B4(struct Sprite ** sprites);
+void sub_81CA448(struct Sprite ** sprites, s32 a1);
+void sub_81CA474(struct Sprite * sprite);
+void sub_81CA2DC(void);
+bool32 sub_81CA324(void);
+void sub_81CA640(void);
+void sub_81CA698(void);
+void sub_81CA6E0(void);
+void sub_81CA714(void);
+void sub_81CA770(void);
+bool32 sub_81CA7C4(void);
+void sub_81CA7D4(void);
+void sub_81CA7F4(void);
+void sub_81CA818(void);
+void sub_81CA850(void);
+void sub_81CA864(void);
+bool32 sub_81CA89C(void);
+void titlescreen_0(void);
+void sub_81CA994(void);
+void sub_81CA9C8(void);
+void sub_81CA9D8(void);
+void sub_81CAA3C(void);
extern const u32 gPokenavOptions_Gfx[];
extern const u16 gPokenavOptions_Pal[];
@@ -16,51 +83,38 @@ const u32 gUnknown_0861FCAC[] = INCBIN_U32("graphics/pokenav/bg.bin.lz");
const u16 gUnknown_0861FD4C[] = INCBIN_U16("graphics/pokenav/outline.gbapal");
const u32 gUnknown_0861FD6C[] = INCBIN_U32("graphics/pokenav/outline.4bpp.lz");
const u32 gUnknown_0861FFF4[] = INCBIN_U32("graphics/pokenav/outline_map.bin.lz");
-const u16 gUnknown_08620104[] = INCBIN_U16("graphics/pokenav/blue_light.gbapal");
+const u16 gUnknown_08620104[] = INCBIN_U16("graphics/pokenav/blue_light.gbapal");
const u32 gUnknown_08620124[] = INCBIN_U32("graphics/pokenav/blue_light.4bpp.lz");
-const struct BgTemplate gUnknown_08620194[3] =
-{
+const struct BgTemplate gUnknown_08620194[] = {
{
.bg = 1,
.charBaseIndex = 1,
- .mapBaseIndex = 0x0F,
+ .mapBaseIndex = 15,
.screenSize = 0,
.paletteMode = 0,
.priority = 1,
- .baseTile = 0
- },
- {
+ .baseTile = 0x000
+ }, {
.bg = 2,
.charBaseIndex = 2,
- .mapBaseIndex = 0x17,
+ .mapBaseIndex = 23,
.screenSize = 0,
.paletteMode = 0,
.priority = 2,
- .baseTile = 0
- },
- {
+ .baseTile = 0x000
+ }, {
.bg = 3,
.charBaseIndex = 3,
- .mapBaseIndex = 0x1F,
+ .mapBaseIndex = 31,
.screenSize = 0,
.paletteMode = 0,
.priority = 3,
- .baseTile = 0
+ .baseTile = 0x000
}
};
-u32 sub_81C9C6C(s32);
-u32 sub_81C9CA8(s32);
-u32 sub_81C9D44(s32);
-u32 sub_81C9DD8(s32);
-u32 sub_81C9E58(s32);
-u32 sub_81C9EC8(s32);
-u32 sub_81C9EF8(s32);
-u32 sub_81C9F28(s32);
-
-u32 (*const gUnknown_086201A0[])(s32) =
-{
+const LoopedTask gUnknown_086201A0[] = {
NULL,
sub_81C9C6C,
sub_81C9CA8,
@@ -86,8 +140,8 @@ const struct CompressedSpriteSheet gUnknown_086201C4[] =
}
};
- const struct SpritePalette gUnknown_086201D4[] =
- {
+const struct SpritePalette gUnknown_086201D4[] =
+{
{gPokenavOptions_Pal + 0x00, 4},
{gPokenavOptions_Pal + 0x10, 5},
{gPokenavOptions_Pal + 0x20, 6},
@@ -98,10 +152,10 @@ const struct CompressedSpriteSheet gUnknown_086201C4[] =
};
const u16 gUnknown_0862020C[] = {0, 0};
-const u16 gUnknown_08620210[] = {0x20, 1};
-const u16 gUnknown_08620214[] = {0x40, 4};
+const u16 gUnknown_08620210[] = {0x20, 1};
+const u16 gUnknown_08620214[] = {0x40, 4};
const u16 gUnknown_08620218[] = {0x60, 2};
-const u16 gUnknown_0862021C[] = {0x80, 3};
+const u16 gUnknown_0862021C[] = {0x80, 3};
const u16 gUnknown_08620220[] = {0xA0, 1};
const u16 gUnknown_08620224[] = {0xC0, 1};
const u16 gUnknown_08620228[] = {0xE0, 4};
@@ -118,36 +172,36 @@ struct UnkStruct_08620240
const u16 *unk4[6];
};
-const struct UnkStruct_08620240 gUnknown_08620240[5] =
+const struct UnkStruct_08620240 gUnknown_08620240[5] =
{
{
0x2A,
- 0x14,
- {gUnknown_0862020C, gUnknown_08620210, gUnknown_0862021C, NULL, NULL, NULL}
+ 0x14,
+ {gUnknown_0862020C, gUnknown_08620210, gUnknown_0862021C, NULL, NULL, NULL}
},
{
0x2A,
- 0x14,
- {gUnknown_0862020C, gUnknown_08620210, gUnknown_08620214, gUnknown_0862021C, NULL, NULL}
+ 0x14,
+ {gUnknown_0862020C, gUnknown_08620210, gUnknown_08620214, gUnknown_0862021C, NULL, NULL}
},
{
0x2A,
- 0x14,
- {gUnknown_0862020C, gUnknown_08620210, gUnknown_08620214, gUnknown_08620218, gUnknown_0862021C, NULL}
+ 0x14,
+ {gUnknown_0862020C, gUnknown_08620210, gUnknown_08620214, gUnknown_08620218, gUnknown_0862021C, NULL}
},
{
0x38,
- 0x14,
- {gUnknown_08620220, gUnknown_08620224, gUnknown_0862023C, NULL, NULL, NULL}
+ 0x14,
+ {gUnknown_08620220, gUnknown_08620224, gUnknown_0862023C, NULL, NULL, NULL}
},
{
0x28,
- 0x10,
- {gUnknown_08620228, gUnknown_0862022C, gUnknown_08620230, gUnknown_08620234, gUnknown_08620238, gUnknown_0862023C}
+ 0x10,
+ {gUnknown_08620228, gUnknown_0862022C, gUnknown_08620230, gUnknown_08620234, gUnknown_08620238, gUnknown_0862023C}
},
};
-const struct WindowTemplate gUnknown_086202CC =
+const struct WindowTemplate gUnknown_086202CC =
{
.bg = 1,
.tilemapLeft = 3,
@@ -158,29 +212,29 @@ const struct WindowTemplate gUnknown_086202CC =
.baseBlock = 8
};
-const u8 *const gUnknown_086202D4[] =
+const u8 *const gUnknown_086202D4[] =
{
gUnknown_085EBCC5,
- gUnknown_085EBCE8,
- gUnknown_085EBD01,
- gUnknown_085EBD1C,
- gUnknown_085EBD34,
- gUnknown_085EBD83,
- gUnknown_085EBDA2,
- gUnknown_085EBDBF,
- gUnknown_085EBDDB,
- gUnknown_085EBDEE,
- gUnknown_085EBE06,
- gUnknown_085EBE19,
- gUnknown_085EBE2D,
- gUnknown_085EBE41
+ gUnknown_085EBCE8,
+ gUnknown_085EBD01,
+ gUnknown_085EBD1C,
+ gUnknown_085EBD34,
+ gUnknown_085EBD83,
+ gUnknown_085EBDA2,
+ gUnknown_085EBDBF,
+ gUnknown_085EBDDB,
+ gUnknown_085EBDEE,
+ gUnknown_085EBE06,
+ gUnknown_085EBE19,
+ gUnknown_085EBE2D,
+ gUnknown_085EBE41
};
const u8 gUnknown_0862030C[] = {6, 8, 7};
const u8 gUnknown_0862030F[] = {6, 8, 7, 0, 0};
-const struct OamData gUnknown_08620314 =
+const struct OamData gUnknown_08620314 =
{
.y = 0,
.affineMode = 0,
@@ -210,7 +264,7 @@ const union AffineAnimCmd gUnknown_0862032C[] =
const union AffineAnimCmd *const gUnknown_08620344[] =
{
gUnknown_0862031C,
- gUnknown_0862032C
+ gUnknown_0862032C
};
const struct SpriteTemplate gUnknown_0862034C =
@@ -224,7 +278,7 @@ const struct SpriteTemplate gUnknown_0862034C =
.callback = SpriteCallbackDummy,
};
-const struct OamData gUnknown_08620364 =
+const struct OamData gUnknown_08620364 =
{
.y = 0,
.affineMode = 0,
@@ -249,12 +303,12 @@ const struct SpriteTemplate gUnknown_0862036C =
.callback = SpriteCallbackDummy,
};
-const struct ScanlineEffectParams gUnknown_08620384 =
+const struct ScanlineEffectParams gUnknown_08620384 =
{
(void *)REG_ADDR_WIN0H,
- ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1,
- 1,
- 0
+ ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1,
+ 1,
+ 0
};
bool32 sub_81C98D4(void)
@@ -264,10 +318,666 @@ bool32 sub_81C98D4(void)
for (i = 0; i < REMATCH_TABLE_ENTRIES; i++)
{
if (sub_81CB0C8(i) == gMapHeader.regionMapSectionId
- && sub_81CAE08(i)
- && gSaveBlock1Ptr->trainerRematches[i])
+ && sub_81CAE08(i)
+ && gSaveBlock1Ptr->trainerRematches[i])
return TRUE;
}
return FALSE;
}
+
+bool32 sub_81C9924(void)
+{
+ struct Pokenav2Struct * unk = sub_81C9958();
+
+ if (unk == NULL)
+ return FALSE;
+
+ unk->field_00d = 0;
+ return TRUE;
+}
+
+bool32 sub_81C9940(void)
+{
+ struct Pokenav2Struct * unk = sub_81C9958();
+
+ if (unk == NULL)
+ return FALSE;
+
+ unk->field_00d = 1;
+ return TRUE;
+}
+
+struct Pokenav2Struct * sub_81C9958(void)
+{
+ struct Pokenav2Struct * unk = AllocSubstruct(2, sizeof(struct Pokenav2Struct));
+
+ if (unk != NULL)
+ {
+ unk->field_00c = 0;
+ unk->loopedTaskId = CreateLoopedTask(sub_81C9A10, 1);
+ unk->callback = sub_81C99FC;
+ }
+
+ return unk;
+}
+
+
+void sub_81C9990(s32 ltIdx)
+{
+ struct Pokenav2Struct * unk = GetSubstructPtr(2);
+
+ unk->loopedTaskId = CreateLoopedTask(gUnknown_086201A0[ltIdx], 1);
+ unk->callback = sub_81C99FC;
+}
+
+bool32 sub_81C99C0(void)
+{
+ struct Pokenav2Struct * unk = GetSubstructPtr(2);
+
+ return unk->callback();
+}
+
+void sub_81C99D4(void)
+{
+ struct Pokenav2Struct * unk = GetSubstructPtr(2);
+
+ sub_81CA7F4();
+ RemoveWindow(unk->field_008);
+ sub_81C9FEC();
+ sub_81CA994();
+ FreePokenavSubstruct(2);
+}
+
+bool32 sub_81C99FC(void)
+{
+ struct Pokenav2Struct * unk = GetSubstructPtr(2);
+
+ return IsLoopedTaskActive(unk->loopedTaskId);
+}
+
+u32 sub_81C9A10(s32 state)
+{
+ struct Pokenav2Struct * unk = GetSubstructPtr(2);
+
+ switch (state)
+ {
+ case 0:
+ InitBgTemplates(gUnknown_08620194, ARRAY_COUNT(gUnknown_08620194));
+ decompress_and_copy_tile_data_to_vram(1, gPokenavMessageBox_Gfx, 0, 0, 0);
+ SetBgTilemapBuffer(1, unk->field_08c);
+ CopyToBgTilemapBuffer(1, gPokenavMessageBox_Tilemap, 0, 0);
+ CopyBgTilemapBufferToVram(1);
+ CopyPaletteIntoBufferUnfaded(gPokenavMessageBox_Pal, 0x10, 0x20);
+ ChangeBgX(1, 0, 0);
+ ChangeBgY(1, 0, 0);
+ ChangeBgX(2, 0, 0);
+ ChangeBgY(2, 0, 0);
+ ChangeBgX(3, 0, 0);
+ ChangeBgY(3, 0, 0);
+ return 0;
+ case 1:
+ if (free_temp_tile_data_buffers_if_possible())
+ return 2;
+ decompress_and_copy_tile_data_to_vram(2, gUnknown_0861FD6C, 0, 0, 0);
+ decompress_and_copy_tile_data_to_vram(2, gUnknown_0861FFF4, 0, 0, 1);
+ CopyPaletteIntoBufferUnfaded(gUnknown_0861FD4C, 0x20, 0x20);
+ return 0;
+ case 2:
+ if (free_temp_tile_data_buffers_if_possible())
+ return 2;
+ decompress_and_copy_tile_data_to_vram(3, gUnknown_0861FC98, 0, 0, 0);
+ decompress_and_copy_tile_data_to_vram(3, gUnknown_0861FCAC, 0, 0, 1);
+ CopyPaletteIntoBufferUnfaded(gUnknown_0861FC78, 0x30, 0x20);
+ if (sub_81C9894() == 3 || sub_81C9894() == 4)
+ sub_81CA850();
+ return 0;
+ case 3:
+ if (free_temp_tile_data_buffers_if_possible())
+ return 2;
+ sub_81CA6E0();
+ sub_81CA7D4();
+ return 1;
+ case 4:
+ sub_81C9FC4();
+ return 1;
+ case 5:
+ sub_81CA714();
+ sub_81CA02C();
+ sub_81CA640();
+ sub_81CA0C8();
+ return 0;
+ case 6:
+ if (sub_81CA7C4())
+ return 2;
+ return 1;
+ case 7:
+ ShowBg(1);
+ ShowBg(2);
+ ShowBg(3);
+ if (unk->field_00d)
+ sub_81C7AC0(1);
+ else
+ {
+ PlaySE(SE_PN_ON);
+ sub_81C7AC0(3);
+ }
+ switch (sub_81C9894())
+ {
+ case 4:
+ LoadLeftHeaderGfxForIndex(7);
+ // fallthrough
+ case 3:
+ LoadLeftHeaderGfxForIndex(1);
+ break;
+ default:
+ LoadLeftHeaderGfxForIndex(0);
+ break;
+ }
+ return 0;
+ case 8:
+ if (IsPaletteFadeActive())
+ return 2;
+ switch (sub_81C9894())
+ {
+ case 4:
+ sub_81C7FA0(7, FALSE, FALSE);
+ // fallthrough
+ case 3:
+ sub_81C7FA0(1, FALSE, FALSE);
+ break;
+ default:
+ sub_81C7FA0(0, FALSE, FALSE);
+ break;
+ }
+ sub_81CA20C();
+ titlescreen_0();
+ return 1;
+ case 9:
+ if (sub_81CA324())
+ return 2;
+ if (sub_81C8010())
+ return 2;
+ break;
+ }
+ return 4;
+}
+
+u32 sub_81C9C6C(s32 state)
+{
+ switch (state)
+ {
+ case 0:
+ sub_81CAA3C();
+ sub_81CA278();
+ sub_81CA714();
+ PlaySE(SE_SELECT);
+ return 0;
+ case 1:
+ if (sub_81CA324())
+ return 2;
+ if (sub_81CA7C4())
+ return 2;
+ break;
+ }
+ return 4;
+}
+
+u32 sub_81C9CA8(s32 state)
+{
+ switch (state)
+ {
+ case 0:
+ sub_81CA9C8();
+ sub_81CA2DC();
+ sub_81C7FC4(0, 0);
+ PlaySE(SE_SELECT);
+ return 0;
+ case 1:
+ if (sub_81CA324())
+ return 2;
+ if (sub_81C8010())
+ return 2;
+ sub_81CA0C8();
+ LoadLeftHeaderGfxForIndex(1);
+ return 0;
+ case 2:
+ sub_81CA20C();
+ sub_81C7FA0(1, FALSE, FALSE);
+ sub_81CA818();
+ sub_81CA714();
+ return 0;
+ case 3:
+ if (sub_81CA324())
+ return 2;
+ if (sub_81C8010())
+ return 2;
+ if (sub_81CA89C())
+ return 2;
+ if (sub_81CA7C4())
+ return 2;
+ sub_81CA9D8();
+ break;
+ }
+ return 4;
+}
+
+u32 sub_81C9D44(s32 state)
+{
+ switch (state)
+ {
+ case 0:
+ sub_81CA9C8();
+ sub_81CA2DC();
+ sub_81C7FC4(1, 0);
+ return 0;
+ case 1:
+ if (sub_81CA324())
+ return 2;
+ if (sub_81C8010())
+ return 2;
+ sub_81CA0C8();
+ LoadLeftHeaderGfxForIndex(0);
+ return 0;
+ case 2:
+ sub_81CA20C();
+ sub_81C7FA0(0, FALSE, FALSE);
+ sub_81CA864();
+ sub_81CA714();
+ return 0;
+ case 3:
+ if (sub_81CA324())
+ return 2;
+ if (sub_81C8010())
+ return 2;
+ if (sub_81CA89C())
+ return 2;
+ if (sub_81CA7C4())
+ return 2;
+ sub_81CA9D8();
+ break;
+ }
+ return 4;
+}
+
+u32 sub_81C9DD8(s32 state)
+{
+ switch (state)
+ {
+ case 0:
+ sub_81CA9C8();
+ sub_81CA2DC();
+ PlaySE(SE_SELECT);
+ return 0;
+ case 1:
+ if (sub_81CA324())
+ return 2;
+ LoadLeftHeaderGfxForIndex(7);
+ sub_81CA0C8();
+ return 0;
+ case 2:
+ sub_81CA20C();
+ sub_81C7FA0(7, FALSE, FALSE);
+ sub_81CA714();
+ return 0;
+ case 3:
+ if (sub_81CA324())
+ return 2;
+ if (sub_81C8010())
+ return 2;
+ if (sub_81CA89C())
+ return 2;
+ sub_81CA9D8();
+ break;
+ }
+ return 4;
+}
+
+u32 sub_81C9E58(s32 state)
+{
+ switch (state)
+ {
+ case 0:
+ sub_81CA9C8();
+ sub_81CA2DC();
+ sub_81C7FC4(7, 0);
+ return 0;
+ case 1:
+ if (sub_81CA324())
+ return 2;
+ if (sub_81C8010())
+ return 2;
+ sub_81CA0C8();
+ return 0;
+ case 2:
+ sub_81CA20C();
+ sub_81CA714();
+ return 0;
+ case 3:
+ if (sub_81CA324())
+ return 2;
+ if (sub_81CA89C())
+ return 2;
+ sub_81CA9D8();
+ break;
+ }
+ return 4;
+}
+
+u32 sub_81C9EC8(s32 state)
+{
+ switch (state)
+ {
+ case 0:
+ PlaySE(SE_HAZURE);
+ sub_81CA770();
+ return 0;
+ case 1:
+ if (IsDma3ManagerBusyWithBgCopy())
+ return 2;
+ break;
+ }
+ return 4;
+}
+
+u32 sub_81C9EF8(s32 state)
+{
+ switch (state)
+ {
+ case 0:
+ PlaySE(SE_SELECT);
+ sub_81CA714();
+ return 0;
+ case 1:
+ if (IsDma3ManagerBusyWithBgCopy())
+ return 2;
+ break;
+ }
+ return 4;
+}
+
+u32 sub_81C9F28(s32 state)
+{
+ switch (state)
+ {
+ case 0:
+ sub_81C7BA4(sub_81C98C4());
+ return 0;
+ case 1:
+ if (IsDma3ManagerBusyWithBgCopy_())
+ return 2;
+ sub_81C7880();
+ sub_81CA9C8();
+ sub_81CA2DC();
+ switch (sub_81C9894())
+ {
+ case 4:
+ sub_81C7FC4(7, FALSE);
+ // fallthrough
+ case 3:
+ sub_81C7FC4(1, FALSE);
+ break;
+ default:
+ sub_81C7FC4(0, FALSE);
+ break;
+ }
+ PlaySE(SE_SELECT);
+ return 0;
+ case 2:
+ if (sub_81CA324())
+ return 2;
+ if (sub_81C8010())
+ return 2;
+ sub_81C7AC0(0);
+ return 0;
+ case 3:
+ if (IsPaletteFadeActive())
+ return 2;
+ break;
+ }
+ return 4;
+}
+
+void sub_81C9FC4(void)
+{
+ u32 i;
+
+ for (i = 0; i < 2; i++)
+ LoadCompressedSpriteSheet(&gUnknown_086201C4[i]);
+ Pokenav_AllocAndLoadPalettes(gUnknown_086201D4);
+}
+
+void sub_81C9FEC(void)
+{
+ FreeSpriteTilesByTag(3);
+ FreeSpriteTilesByTag(1);
+ FreeSpritePaletteByTag(4);
+ FreeSpritePaletteByTag(5);
+ FreeSpritePaletteByTag(6);
+ FreeSpritePaletteByTag(7);
+ FreeSpritePaletteByTag(8);
+ FreeSpritePaletteByTag(3);
+ sub_81CA094();
+ sub_81CA698();
+}
+
+void sub_81CA02C(void)
+{
+ s32 i, j;
+ struct Pokenav2Struct * unk = GetSubstructPtr(2);
+
+ for (i = 0; i < 6; i++)
+ {
+ for (j = 0; j < 4; j++)
+ {
+ u8 spriteId = CreateSprite(&gUnknown_0862034C, 0x8c, 20 * i + 40, 3);
+ unk->field_02c[i][j] = &gSprites[spriteId];
+ gSprites[spriteId].pos2.x = 32 * j;
+ }
+ }
+}
+
+void sub_81CA094(void)
+{
+ s32 i, j;
+ struct Pokenav2Struct * unk = GetSubstructPtr(2);
+
+ for (i = 0; i < 6; i++)
+ {
+ for (j = 0; j < 4; j++)
+ {
+ FreeSpriteOamMatrix(unk->field_02c[i][j]);
+ DestroySprite(unk->field_02c[i][j]);
+ }
+ }
+}
+
+void sub_81CA0C8(void)
+{
+ s32 r0 = sub_81C9894();
+ sub_81CA0EC(gUnknown_08620240[r0].unk4, gUnknown_08620240[r0].unk0, gUnknown_08620240[r0].unk2);
+}
+
+void sub_81CA0EC(const u16 *const *a0, s32 a1, s32 a2)
+{
+ s32 i, j;
+ struct Pokenav2Struct * unk = GetSubstructPtr(2);
+ s32 sp04 = GetSpriteTileStartByTag(3);
+
+ for (i = 0; i < 6; i++)
+ {
+ if (*a0 != NULL)
+ {
+ for (j = 0; j < 4; j++)
+ {
+ unk->field_02c[i][j]->oam.tileNum = (*a0)[0] + sp04 + 8 * j;
+ unk->field_02c[i][j]->oam.paletteNum = IndexOfSpritePaletteTag((*a0)[1] + 4);
+ unk->field_02c[i][j]->invisible = TRUE;
+ unk->field_02c[i][j]->pos1.y = a1;
+ unk->field_02c[i][j]->pos1.x = 0x8c;
+ unk->field_02c[i][j]->pos2.x = 32 * j;
+ }
+ unk->field_010[i] = TRUE;
+ }
+ else
+ {
+ for (j = 0; j < 4; j++)
+ {
+ unk->field_02c[i][j]->invisible = TRUE;
+ }
+ unk->field_010[i] = FALSE;
+ }
+ a0++;
+ a1 += a2;
+ }
+}
+
+void sub_81CA20C(void)
+{
+ s32 i;
+ struct Pokenav2Struct * unk = GetSubstructPtr(2);
+ s32 r8 = sub_81C98A4();
+ s32 r7 = 0;
+ s32 r2;
+
+ for (i = 0; i < 6; i++)
+ {
+ if (unk->field_010[i])
+ {
+ if (r7++ == r8)
+ {
+ r2 = 0x82;
+ unk->field_00b = i;
+ }
+ else
+ r2 = 0x8c;
+ sub_81CA35C(unk->field_02c[i], 0x100, r2, 0xC);
+ sub_81CA448(unk->field_02c[i], 0);
+ }
+ else
+ sub_81CA448(unk->field_02c[i], 1);
+ }
+}
+
+void sub_81CA278(void)
+{
+ s32 i;
+ struct Pokenav2Struct * unk = GetSubstructPtr(2);
+ s32 r3 = sub_81C98A4();
+ s32 r5;
+
+ for (i = 0, r5 = 0; i < 6; i++)
+ {
+ if (unk->field_010[i])
+ {
+ if (r5 == r3)
+ {
+ r5 = i;
+ break;
+ }
+ r5++;
+ }
+ }
+
+ sub_81CA35C(unk->field_02c[unk->field_00b], 0x82, 0x8c, 0x4);
+ sub_81CA35C(unk->field_02c[r5], 0x8c, 0x82, 0x4);
+ unk->field_00b = r5;
+}
+
+void sub_81CA2DC(void)
+{
+ s32 i;
+ struct Pokenav2Struct * unk = GetSubstructPtr(2);
+
+ for (i = 0; i < 6; i++)
+ {
+ if (unk->field_010[i])
+ {
+ if (unk->field_00b != i)
+ sub_81CA35C(unk->field_02c[i], 0x8C, 0x100, 0x8);
+ else
+ sub_81CA3B4(unk->field_02c[i]);
+ }
+ }
+}
+
+bool32 sub_81CA324(void)
+{
+ s32 i;
+ struct Pokenav2Struct * unk = GetSubstructPtr(2);
+
+ for (i = 0; i < 6; i++)
+ {
+ if (unk->field_02c[i][0]->callback != SpriteCallbackDummy)
+ return TRUE;
+ }
+
+ if (unk->field_00c)
+ return TRUE;
+
+ return FALSE;
+}
+
+#ifdef NONMATCHING
+void sub_81CA35C(struct Sprite ** sprites, s32 a1, s32 a2, s32 a3)
+{
+ s32 i;
+
+ for (i = 0; i < 4; i++)
+ {
+ sprites[i]->pos1.x = a1;
+ sprites[i]->data[0] = a3;
+ sprites[i]->data[1] = 16 * (a2 - a1) / a3;
+ sprites[i]->data[2] = 16 * a1;
+ sprites[i]->data[7] = a2;
+ sprites[i]->callback = sub_81CA474;
+ }
+}
+#else
+NAKED
+void sub_81CA35C(struct Sprite ** sprites, s32 a1, s32 a2, s32 a3)
+{
+ asm_unified("\tpush {r4-r7,lr}\n"
+ "\tmov r7, r9\n"
+ "\tmov r6, r8\n"
+ "\tpush {r6,r7}\n"
+ "\tadds r4, r0, 0\n"
+ "\tadds r5, r1, 0\n"
+ "\tmov r9, r2\n"
+ "\tadds r6, r3, 0\n"
+ "\tldr r0, =sub_81CA474\n"
+ "\tmov r8, r0\n"
+ "\tsubs r0, r2, r5\n"
+ "\tlsls r0, 4\n"
+ "\tadds r1, r6, 0\n"
+ "\tbl __divsi3\n"
+ "\tadds r3, r0, 0\n"
+ "\tmovs r1, 0x3\n"
+ "\tlsls r2, r5, 4\n"
+ "_081CA380:\n"
+ "\tldr r0, [r4]\n"
+ "\tstrh r5, [r0, 0x20]\n"
+ "\tldr r0, [r4]\n"
+ "\tstrh r6, [r0, 0x2E]\n"
+ "\tldr r0, [r4]\n"
+ "\tstrh r3, [r0, 0x30]\n"
+ "\tldr r0, [r4]\n"
+ "\tstrh r2, [r0, 0x32]\n"
+ "\tldr r0, [r4]\n"
+ "\tmov r7, r9\n"
+ "\tstrh r7, [r0, 0x3C]\n"
+ "\tldm r4!, {r0}\n"
+ "\tmov r7, r8\n"
+ "\tstr r7, [r0, 0x1C]\n"
+ "\tsubs r1, 0x1\n"
+ "\tcmp r1, 0\n"
+ "\tbge _081CA380\n"
+ "\tpop {r3,r4}\n"
+ "\tmov r8, r3\n"
+ "\tmov r9, r4\n"
+ "\tpop {r4-r7}\n"
+ "\tpop {r0}\n"
+ "\tbx r0\n"
+ "\t.pool");
+}
+#endif //NONMATCHING
diff --git a/src/trainer_hill.c b/src/trainer_hill.c
index 650a748cb..77c8fcb53 100644
--- a/src/trainer_hill.c
+++ b/src/trainer_hill.c
@@ -915,7 +915,7 @@ void SetHillTrainerFlag(void)
}
}
-const u8 *sub_81D62AC(void)
+const u8 *GetTrainerHillTrainerScript(void)
{
return EventScript_2C83F0;
}
diff --git a/src/trainer_see.c b/src/trainer_see.c
index 9925aa6bc..22b256a99 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -235,7 +235,7 @@ static u8 CheckTrainer(u8 eventObjectId)
u8 approachDistance;
if (InTrainerHill() == TRUE)
- scriptPtr = sub_81D62AC();
+ scriptPtr = GetTrainerHillTrainerScript();
else
scriptPtr = GetEventObjectScriptPointerByEventObjectId(eventObjectId);
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 09:41:59 +0000