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

remove "+1" from function pointer labels

Browse Source
This commit is contained in:
YamaArashi 2015-10-20 23:52:50 -07:00
parent e771d87c78
commit 269cda7ac9
8 changed files with 4811 additions and 4811 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9380
asm/emerald.s
View File

File diff suppressed because it is too large Load Diff

26
asm/libagbbackup.s
View File

@ -130,7 +130,7 @@ SetFlashTimerIntr: ; 82E1944
ldr r3, =0x04000100 ldr r3, =0x04000100
adds r0, r3 adds r0, r3
str r0, [r1] str r0, [r1]
ldr r0, =FlashTimerIntr + 1 ldr r0, =FlashTimerIntr
str r0, [r2] str r0, [r2]
movs r0, 0 movs r0, 0
b @082E197A b @082E197A
@ -258,11 +258,11 @@ SetReadFlash1: ; 82E1A70
ldr r1, =0x03007844 ldr r1, =0x03007844
adds r0, r2, 0x1 adds r0, r2, 0x1
str r0, [r1] str r0, [r1]
ldr r3, =ReadFlash1 + 1 ldr r3, =ReadFlash1
movs r0, 0x1 movs r0, 0x1
eors r3, r0 eors r3, r0
ldr r0, =SetReadFlash1 + 1 ldr r0, =SetReadFlash1
ldr r1, =ReadFlash1 + 1 ldr r1, =ReadFlash1
subs r0, r1 subs r0, r1
lsls r0, 15 lsls r0, 15
b @082E1AA4 b @082E1AA4
@ -336,12 +336,12 @@ ReadFlash: ; 82E1AD4
movs r0, 0xF movs r0, 0xF
ands r4, r0 ands r4, r0
@082E1B0C: @082E1B0C:
ldr r3, =ReadFlash_Core + 1 ldr r3, =ReadFlash_Core
movs r0, 0x1 movs r0, 0x1
eors r3, r0 eors r3, r0
mov r2, sp mov r2, sp
ldr r0, =ReadFlash + 1 ldr r0, =ReadFlash
ldr r1, =ReadFlash_Core + 1 ldr r1, =ReadFlash_Core
subs r0, r1 subs r0, r1
lsls r0, 15 lsls r0, 15
b @082E1B40 b @082E1B40
@ -439,12 +439,12 @@ VerifyFlashSector: ; 82E1BA0
movs r0, 0xF movs r0, 0xF
ands r4, r0 ands r4, r0
@082E1BD4: @082E1BD4:
ldr r3, =VerifyFlashSector_Core + 1 ldr r3, =VerifyFlashSector_Core
movs r0, 0x1 movs r0, 0x1
eors r3, r0 eors r3, r0
mov r2, sp mov r2, sp
ldr r0, =VerifyFlashSector + 1 ldr r0, =VerifyFlashSector
ldr r1, =VerifyFlashSector_Core + 1 ldr r1, =VerifyFlashSector_Core
subs r0, r1 subs r0, r1
lsls r0, 15 lsls r0, 15
b @082E1C08 b @082E1C08
@ -511,12 +511,12 @@ VerifyFlashSectorFirstNBytes: ; 82E1C38
movs r1, 0x3 movs r1, 0x3
orrs r0, r1 orrs r0, r1
strh r0, [r2] strh r0, [r2]
ldr r3, =VerifyFlashSector_Core + 1 ldr r3, =VerifyFlashSector_Core
movs r0, 0x1 movs r0, 0x1
eors r3, r0 eors r3, r0
mov r2, sp mov r2, sp
ldr r0, =VerifyFlashSector + 1 ldr r0, =VerifyFlashSector
ldr r1, =VerifyFlashSector_Core + 1 ldr r1, =VerifyFlashSector_Core
subs r0, r1 subs r0, r1
lsls r0, 15 lsls r0, 15
b @082E1CA0 b @082E1CA0

32
asm/libmks4agb.s
View File

@ -2039,7 +2039,7 @@ _082E00CC:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_082E00F0: .4byte SoundMainRAM + 1 _082E00F0: .4byte SoundMainRAM
_082E00F4: .4byte 0x03001aa8 _082E00F4: .4byte 0x03001aa8
_082E00F8: .4byte 0x04000200 _082E00F8: .4byte 0x04000200
_082E00FC: .4byte 0x03006380 _082E00FC: .4byte 0x03006380
@ -2514,18 +2514,18 @@ _082E0468: .4byte 0x04000063
_082E046C: .4byte 0x03007ff0 _082E046C: .4byte 0x03007ff0
_082E0470: .4byte 0x68736d53 _082E0470: .4byte 0x68736d53
_082E0474: .4byte 0x03007460 _082E0474: .4byte 0x03007460
_082E0478: .4byte ply_memacc + 1 _082E0478: .4byte ply_memacc
_082E047C: .4byte ply_lfos_rev01 + 1 _082E047C: .4byte ply_lfos_rev01
_082E0480: .4byte ply_mod_rev01 + 1 _082E0480: .4byte ply_mod_rev01
_082E0484: .4byte ply_xcmd + 1 _082E0484: .4byte ply_xcmd
_082E0488: .4byte ply_endtie_rev01 + 1 _082E0488: .4byte ply_endtie_rev01
_082E048C: .4byte SampFreqSet_rev01 + 1 _082E048C: .4byte SampFreqSet_rev01
_082E0490: .4byte TrackStop_rev01 + 1 _082E0490: .4byte TrackStop_rev01
_082E0494: .4byte FadeOutBody_rev01 + 1 _082E0494: .4byte FadeOutBody_rev01
_082E0498: .4byte TrkVolPitSet_rev01 + 1 _082E0498: .4byte TrkVolPitSet_rev01
_082E049C: .4byte CgbSound + 1 _082E049C: .4byte CgbSound
_082E04A0: .4byte CgbOscOff + 1 _082E04A0: .4byte CgbOscOff
_082E04A4: .4byte MidiKey2CgbFr + 1 _082E04A4: .4byte MidiKey2CgbFr
_082E04A8: .4byte 0x00000000 _082E04A8: .4byte 0x00000000
_082E04AC: .4byte 0x05000040 _082E04AC: .4byte 0x05000040
thumb_func_end MPlayExtender thumb_func_end MPlayExtender
@ -2667,8 +2667,8 @@ _082E05B4: .4byte 0x040000a0
_082E05B8: .4byte 0x040000a4 _082E05B8: .4byte 0x040000a4
_082E05BC: .4byte 0x03007ff0 _082E05BC: .4byte 0x03007ff0
_082E05C0: .4byte 0x050003ec _082E05C0: .4byte 0x050003ec
_082E05C4: .4byte ply_note_rev01 + 1 _082E05C4: .4byte ply_note_rev01
_082E05C8: .4byte DummyFunc_rev + 1 _082E05C8: .4byte DummyFunc_rev
_082E05CC: .4byte 0x03007460 _082E05CC: .4byte 0x03007460
_082E05D0: .4byte 0x68736d53 _082E05D0: .4byte 0x68736d53
thumb_func_end SoundInit_rev01 thumb_func_end SoundInit_rev01
@ -3033,7 +3033,7 @@ _082E0880:
.align 2, 0 .align 2, 0
_082E0888: .4byte 0x03007ff0 _082E0888: .4byte 0x03007ff0
_082E088C: .4byte 0x68736d53 _082E088C: .4byte 0x68736d53
_082E0890: .4byte MPlayMain_rev01 + 1 _082E0890: .4byte MPlayMain_rev01
thumb_func_end MPlayOpen_rev01 thumb_func_end MPlayOpen_rev01
thumb_func_start MPlayStart_rev01 thumb_func_start MPlayStart_rev01

68
asm/librfu.s
View File

@ -125,7 +125,7 @@ STWI_init_timer: ; 82E2AF0
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_082E2B1C: .4byte STWI_intr_timer + 1 _082E2B1C: .4byte STWI_intr_timer
_082E2B20: .4byte 0x03007868 _082E2B20: .4byte 0x03007868
_082E2B24: .4byte 0x04000208 _082E2B24: .4byte 0x04000208
_082E2B28: .4byte 0x04000200 _082E2B28: .4byte 0x04000200
@ -2391,7 +2391,7 @@ _082E3FC4: .4byte 0x03007894
_082E3FC8: .4byte 0x03007898 _082E3FC8: .4byte 0x03007898
_082E3FCC: .4byte 0x03007880 _082E3FCC: .4byte 0x03007880
_082E3FD0: .4byte 0x03007870 _082E3FD0: .4byte 0x03007870
_082E3FD4: .4byte sub_82E53F4 + 1 _082E3FD4: .4byte sub_82E53F4
_082E3FD8: .4byte 0x0000ffff _082E3FD8: .4byte 0x0000ffff
thumb_func_end rfu_initializeAPI thumb_func_end rfu_initializeAPI
@ -2470,7 +2470,7 @@ rfu_REQ_PARENT_resumeRetransmitAndChange: ; 82E4064
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_082E4074: .4byte rfu_STC_REQ_callback + 1 _082E4074: .4byte rfu_STC_REQ_callback
thumb_func_end rfu_REQ_PARENT_resumeRetransmitAndChange thumb_func_end rfu_REQ_PARENT_resumeRetransmitAndChange
thumb_func_start rfu_UNI_PARENT_getDRAC_ACK thumb_func_start rfu_UNI_PARENT_getDRAC_ACK
@ -2623,7 +2623,7 @@ _082E4166:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_082E416C: .4byte rfu_CB_defaultCallback + 1 _082E416C: .4byte rfu_CB_defaultCallback
_082E4170: .4byte 0x03007894 _082E4170: .4byte 0x03007894
_082E4174: .4byte 0x03007898 _082E4174: .4byte 0x03007898
thumb_func_end rfu_STC_REQ_callback thumb_func_end rfu_STC_REQ_callback
@ -2709,7 +2709,7 @@ rfu_REQ_RFUStatus: ; 82E41FC
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_082E420C: .4byte rfu_STC_REQ_callback + 1 _082E420C: .4byte rfu_STC_REQ_callback
thumb_func_end rfu_REQ_RFUStatus thumb_func_end rfu_REQ_RFUStatus
thumb_func_start rfu_getRFUStatus thumb_func_start rfu_getRFUStatus
@ -2875,7 +2875,7 @@ _082E433C: .4byte 0x00008001
_082E4340: .4byte 0x03007868 _082E4340: .4byte 0x03007868
_082E4344: .4byte 0x04000100 _082E4344: .4byte 0x04000100
_082E4348: .4byte 0x0105ffff _082E4348: .4byte 0x0105ffff
_082E434C: .4byte rfu_CB_stopMode + 1 _082E434C: .4byte rfu_CB_stopMode
_082E4350: _082E4350:
ldr r1, _082E4368 ldr r1, _082E4368
movs r2, 0x80 movs r2, 0x80
@ -2961,7 +2961,7 @@ rfu_REQ_reset: ; 82E43D4
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_082E43E4: .4byte rfu_CB_reset + 1 _082E43E4: .4byte rfu_CB_reset
thumb_func_end rfu_REQ_reset thumb_func_end rfu_REQ_reset
thumb_func_start rfu_CB_reset thumb_func_start rfu_CB_reset
@ -3013,7 +3013,7 @@ rfu_REQ_configSystem: ; 82E440C
strh r0, [r1, 0x1A] strh r0, [r1, 0x1A]
b _082E4466 b _082E4466
.align 2, 0 .align 2, 0
_082E4444: .4byte rfu_STC_REQ_callback + 1 _082E4444: .4byte rfu_STC_REQ_callback
_082E4448: .4byte 0x03007894 _082E4448: .4byte 0x03007894
_082E444C: _082E444C:
ldr r5, _082E446C ldr r5, _082E446C
@ -3110,7 +3110,7 @@ _082E44E6:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_082E44FC: .4byte rfu_CB_configGameData + 1 _082E44FC: .4byte rfu_CB_configGameData
thumb_func_end rfu_REQ_configGameData thumb_func_end rfu_REQ_configGameData
thumb_func_start rfu_CB_configGameData thumb_func_start rfu_CB_configGameData
@ -3234,7 +3234,7 @@ _082E45A6:
bl rfu_STC_clearLinkStatus bl rfu_STC_clearLinkStatus
b _082E45F6 b _082E45F6
.align 2, 0 .align 2, 0
_082E45E4: .4byte rfu_CB_defaultCallback + 1 _082E45E4: .4byte rfu_CB_defaultCallback
_082E45E8: .4byte 0x03007894 _082E45E8: .4byte 0x03007894
_082E45EC: .4byte 0x03007898 _082E45EC: .4byte 0x03007898
_082E45F0: _082E45F0:
@ -3248,7 +3248,7 @@ _082E45F6:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_082E4608: .4byte rfu_CB_startSearchChild + 1 _082E4608: .4byte rfu_CB_startSearchChild
thumb_func_end rfu_REQ_startSearchChild thumb_func_end rfu_REQ_startSearchChild
thumb_func_start rfu_CB_startSearchChild thumb_func_start rfu_CB_startSearchChild
@ -3337,7 +3337,7 @@ rfu_REQ_pollSearchChild: ; 82E4698
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_082E46A8: .4byte rfu_CB_pollAndEndSearchChild + 1 _082E46A8: .4byte rfu_CB_pollAndEndSearchChild
thumb_func_end rfu_REQ_pollSearchChild thumb_func_end rfu_REQ_pollSearchChild
thumb_func_start rfu_REQ_endSearchChild thumb_func_start rfu_REQ_endSearchChild
@ -3349,7 +3349,7 @@ rfu_REQ_endSearchChild: ; 82E46AC
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_082E46BC: .4byte rfu_CB_pollAndEndSearchChild + 1 _082E46BC: .4byte rfu_CB_pollAndEndSearchChild
thumb_func_end rfu_REQ_endSearchChild thumb_func_end rfu_REQ_endSearchChild
thumb_func_start rfu_CB_pollAndEndSearchChild thumb_func_start rfu_CB_pollAndEndSearchChild
@ -3389,7 +3389,7 @@ _082E46D2:
b _082E4730 b _082E4730
.align 2, 0 .align 2, 0
_082E4708: .4byte 0x03007890 _082E4708: .4byte 0x03007890
_082E470C: .4byte rfu_CB_defaultCallback + 1 _082E470C: .4byte rfu_CB_defaultCallback
_082E4710: .4byte 0x03007898 _082E4710: .4byte 0x03007898
_082E4714: _082E4714:
cmp r4, 0x1B cmp r4, 0x1B
@ -3527,7 +3527,7 @@ rfu_REQ_startSearchParent: ; 82E4804
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_082E4814: .4byte rfu_CB_startSearchParent + 1 _082E4814: .4byte rfu_CB_startSearchParent
thumb_func_end rfu_REQ_startSearchParent thumb_func_end rfu_REQ_startSearchParent
thumb_func_start rfu_CB_startSearchParent thumb_func_start rfu_CB_startSearchParent
@ -3560,7 +3560,7 @@ rfu_REQ_pollSearchParent: ; 82E483C
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_082E484C: .4byte sub_82E4850 + 1 _082E484C: .4byte sub_82E4850
thumb_func_end rfu_REQ_pollSearchParent thumb_func_end rfu_REQ_pollSearchParent
thumb_func_start sub_82E4850 thumb_func_start sub_82E4850
@ -3592,7 +3592,7 @@ rfu_REQ_endSearchParent: ; 82E4874
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_082E4884: .4byte rfu_STC_REQ_callback + 1 _082E4884: .4byte rfu_STC_REQ_callback
thumb_func_end rfu_REQ_endSearchParent thumb_func_end rfu_REQ_endSearchParent
thumb_func_start rfu_STC_readParentCandidateList thumb_func_start rfu_STC_readParentCandidateList
@ -3783,7 +3783,7 @@ _082E49CC:
.align 2, 0 .align 2, 0
_082E49E4: .4byte 0x03007890 _082E49E4: .4byte 0x03007890
_082E49E8: .4byte 0x03007894 _082E49E8: .4byte 0x03007894
_082E49EC: .4byte rfu_STC_REQ_callback + 1 _082E49EC: .4byte rfu_STC_REQ_callback
_082E49F0: _082E49F0:
movs r0, 0x1F movs r0, 0x1F
adds r1, r3, 0 adds r1, r3, 0
@ -3803,7 +3803,7 @@ rfu_REQ_pollConnectParent: ; 82E4A00
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_082E4A10: .4byte rfu_CB_pollConnectParent + 1 _082E4A10: .4byte rfu_CB_pollConnectParent
thumb_func_end rfu_REQ_pollConnectParent thumb_func_end rfu_REQ_pollConnectParent
thumb_func_start rfu_CB_pollConnectParent thumb_func_start rfu_CB_pollConnectParent
@ -4007,7 +4007,7 @@ _082E4B90:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_082E4B94: .4byte rfu_CB_pollConnectParent + 1 _082E4B94: .4byte rfu_CB_pollConnectParent
_082E4B98: .4byte 0x03007898 _082E4B98: .4byte 0x03007898
_082E4B9C: .4byte 0x03007894 _082E4B9C: .4byte 0x03007894
thumb_func_end rfu_REQ_endConnectParent thumb_func_end rfu_REQ_endConnectParent
@ -4312,7 +4312,7 @@ _082E4DBC:
.align 2, 0 .align 2, 0
_082E4DDC: .4byte 0x03007898 _082E4DDC: .4byte 0x03007898
_082E4DE0: .4byte 0x03007890 _082E4DE0: .4byte 0x03007890
_082E4DE4: .4byte rfu_CB_defaultCallback + 1 _082E4DE4: .4byte rfu_CB_defaultCallback
_082E4DE8: _082E4DE8:
movs r0, 0x11 movs r0, 0x11
ldr r1, [sp, 0xC] ldr r1, [sp, 0xC]
@ -4794,7 +4794,7 @@ _082E5178:
bl rfu_STC_REQ_callback bl rfu_STC_REQ_callback
b _082E51B0 b _082E51B0
.align 2, 0 .align 2, 0
_082E51A0: .4byte rfu_CB_defaultCallback + 1 _082E51A0: .4byte rfu_CB_defaultCallback
_082E51A4: _082E51A4:
ldr r0, _082E51B8 ldr r0, _082E51B8
bl STWI_set_Callback_M bl STWI_set_Callback_M
@ -4805,7 +4805,7 @@ _082E51B0:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_082E51B8: .4byte rfu_CB_disconnect + 1 _082E51B8: .4byte rfu_CB_disconnect
thumb_func_end rfu_REQ_disconnect thumb_func_end rfu_REQ_disconnect
thumb_func_start rfu_CB_disconnect thumb_func_start rfu_CB_disconnect
@ -4913,7 +4913,7 @@ _082E5286:
bx r0 bx r0
.align 2, 0 .align 2, 0
_082E528C: .4byte 0x03007890 _082E528C: .4byte 0x03007890
_082E5290: .4byte rfu_CB_defaultCallback + 1 _082E5290: .4byte rfu_CB_defaultCallback
_082E5294: .4byte 0x03007898 _082E5294: .4byte 0x03007898
_082E5298: .4byte 0x03007894 _082E5298: .4byte 0x03007894
thumb_func_end rfu_CB_disconnect thumb_func_end rfu_CB_disconnect
@ -4961,7 +4961,7 @@ _082E52CA:
bx r0 bx r0
.align 2, 0 .align 2, 0
_082E52EC: .4byte 0x03007894 _082E52EC: .4byte 0x03007894
_082E52F0: .4byte rfu_STC_REQ_callback + 1 _082E52F0: .4byte rfu_STC_REQ_callback
_082E52F4: .4byte 0x03007890 _082E52F4: .4byte 0x03007890
thumb_func_end rfu_REQ_CHILD_startConnectRecovery thumb_func_end rfu_REQ_CHILD_startConnectRecovery
@ -4974,7 +4974,7 @@ rfu_REQ_CHILD_pollConnectRecovery: ; 82E52F8
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_082E5308: .4byte rfu_CB_CHILD_pollConnectRecovery + 1 _082E5308: .4byte rfu_CB_CHILD_pollConnectRecovery
thumb_func_end rfu_REQ_CHILD_pollConnectRecovery thumb_func_end rfu_REQ_CHILD_pollConnectRecovery
thumb_func_start rfu_CB_CHILD_pollConnectRecovery thumb_func_start rfu_CB_CHILD_pollConnectRecovery
@ -5100,7 +5100,7 @@ rfu_REQ_CHILD_endConnectRecovery: ; 82E53E0
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_082E53F0: .4byte rfu_CB_CHILD_pollConnectRecovery + 1 _082E53F0: .4byte rfu_CB_CHILD_pollConnectRecovery
thumb_func_end rfu_REQ_CHILD_endConnectRecovery thumb_func_end rfu_REQ_CHILD_endConnectRecovery
thumb_func_start sub_82E53F4 thumb_func_start sub_82E53F4
@ -5149,7 +5149,7 @@ rfu_REQ_changeMasterSlave: ; 82E5424
bl STWI_send_MS_ChangeREQ bl STWI_send_MS_ChangeREQ
b _082E544C b _082E544C
.align 2, 0 .align 2, 0
_082E5440: .4byte rfu_STC_REQ_callback + 1 _082E5440: .4byte rfu_STC_REQ_callback
_082E5444: _082E5444:
movs r0, 0x27 movs r0, 0x27
movs r1, 0 movs r1, 0
@ -6432,7 +6432,7 @@ _082E5D80:
b _082E5E4E b _082E5E4E
.align 2, 0 .align 2, 0
_082E5DA4: .4byte 0x03007898 _082E5DA4: .4byte 0x03007898
_082E5DA8: .4byte sub_82E5F00 + 1 _082E5DA8: .4byte sub_82E5F00
_082E5DAC: _082E5DAC:
ldr r0, [r4] ldr r0, [r4]
adds r0, 0x68 adds r0, 0x68
@ -6466,7 +6466,7 @@ _082E5DC4:
bl STWI_send_DataTxAndChangeREQ bl STWI_send_DataTxAndChangeREQ
b _082E5E4E b _082E5E4E
.align 2, 0 .align 2, 0
_082E5DF0: .4byte rfu_CB_sendData + 1 _082E5DF0: .4byte rfu_CB_sendData
_082E5DF4: .4byte 0x03007898 _082E5DF4: .4byte 0x03007898
_082E5DF8: .4byte 0x03007894 _082E5DF8: .4byte 0x03007894
_082E5DFC: _082E5DFC:
@ -6510,7 +6510,7 @@ _082E5E4E:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_082E5E54: .4byte rfu_CB_sendData2 + 1 _082E5E54: .4byte rfu_CB_sendData2
thumb_func_end rfu_REQ_sendData thumb_func_end rfu_REQ_sendData
thumb_func_start rfu_CB_sendData thumb_func_start rfu_CB_sendData
@ -7168,7 +7168,7 @@ _082E6320:
.align 2, 0 .align 2, 0
_082E6328: .4byte 0x03007890 _082E6328: .4byte 0x03007890
_082E632C: .4byte 0x03007894 _082E632C: .4byte 0x03007894
_082E6330: .4byte rfu_CB_recvData + 1 _082E6330: .4byte rfu_CB_recvData
thumb_func_end rfu_REQ_recvData thumb_func_end rfu_REQ_recvData
thumb_func_start rfu_CB_recvData thumb_func_start rfu_CB_recvData
@ -8517,7 +8517,7 @@ rfu_REQ_noise: ; 82E6D54
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_082E6D68: .4byte rfu_STC_REQ_callback + 1 _082E6D68: .4byte rfu_STC_REQ_callback
thumb_func_end rfu_REQ_noise thumb_func_end rfu_REQ_noise
thumb_func_start sub_82E6D6C thumb_func_start sub_82E6D6C
@ -8559,7 +8559,7 @@ _082E6D88:
.align 2, 0 .align 2, 0
_082E6DB4: .4byte 0x04000200 _082E6DB4: .4byte 0x04000200
_082E6DB8: .4byte 0x03007868 _082E6DB8: .4byte 0x03007868
_082E6DBC: .4byte sub_82E6F88 + 1 _082E6DBC: .4byte sub_82E6F88
_082E6DC0: .4byte 0x04000100 _082E6DC0: .4byte 0x04000100
_082E6DC4: _082E6DC4:
strh r6, [r4, 0x2] strh r6, [r4, 0x2]

6
asm/main.s
View File

@ -131,7 +131,7 @@ init_saveblock_ptrs_and_set_copyright_callback2: ; 80004D8
str r0, [r1] str r0, [r1]
str r0, [r2, 0x24] str r0, [r2, 0x24]
str r0, [r2] str r0, [r2]
ldr r0, =c2_copyright_1 + 1 ldr r0, =c2_copyright_1
bl set_callback2 bl set_callback2
ldr r1, =0x03005d90 ldr r1, =0x03005d90
ldr r0, =0x02024a54 ldr r0, =0x02024a54
@ -421,9 +421,9 @@ SetVCountCallback: ; 8000708
; void restore_serial_timer3_irq_handlers() ; void restore_serial_timer3_irq_handlers()
restore_serial_timer3_irq_handlers: ; 8000714 restore_serial_timer3_irq_handlers: ; 8000714
ldr r0, =0x03002710 ldr r0, =0x03002710
ldr r1, =irq_serial + 1 ldr r1, =irq_serial
str r1, [r0, 0x4] str r1, [r0, 0x4]
ldr r1, =irq_timer3 + 1 ldr r1, =irq_timer3
str r1, [r0, 0x8] str r1, [r0, 0x8]
bx lr bx lr
.align 2, 0 .align 2, 0

2
asm/task.s
View File

@ -13,7 +13,7 @@ clear_tasks: ; 80A8F50
adds r2, r0, r6 adds r2, r0, r6
movs r1, 0 movs r1, 0
strb r1, [r2, 0x4] strb r1, [r2, 0x4]
ldr r1, =nullsub_4 + 1 ldr r1, =nullsub_4
str r1, [r2] str r1, [r2]
strb r4, [r2, 0x5] strb r4, [r2, 0x5]
adds r4, 0x1 adds r4, 0x1

12
asm/window.s
View File

@ -23,7 +23,7 @@ Window_InitFromTemplates: ; 80031C0
bl bg_get_tilemap bl bg_get_tilemap
cmp r0, 0 cmp r0, 0
beq @080031E4 beq @080031E4
ldr r0, =nullsub_8 + 1 ldr r0, =nullsub_8
@080031E4: @080031E4:
str r0, [r4] str r0, [r4]
adds r4, 0x4 adds r4, 0x4
@ -151,7 +151,7 @@ Window_InitFromTemplates: ; 80031C0
mov r2, r10 mov r2, r10
adds r5, r2, r0 adds r5, r2, r0
ldr r1, [r5] ldr r1, [r5]
ldr r0, =nullsub_8 + 1 ldr r0, =nullsub_8
cmp r1, r0 cmp r1, r0
beq @08003250 beq @08003250
adds r0, r1, 0 adds r0, r1, 0
@ -332,7 +332,7 @@ Window_AddFromTemplate: ; 8003380
ldr r3, [sp] ldr r3, [sp]
adds r5, r3, r0 adds r5, r3, r0
ldr r1, [r5] ldr r1, [r5]
ldr r0, =nullsub_8 + 1 ldr r0, =nullsub_8
cmp r1, r0 cmp r1, r0
beq @0800346A beq @0800346A
adds r0, r1, 0 adds r0, r1, 0
@ -509,7 +509,7 @@ Window_Remove: ; 8003574
lsls r1, r7, 2 lsls r1, r7, 2
adds r4, r1, r0 adds r4, r1, r0
ldr r1, [r4] ldr r1, [r4]
ldr r0, =nullsub_8 + 1 ldr r0, =nullsub_8
cmp r1, r0 cmp r1, r0
beq @080035CE beq @080035CE
adds r0, r1, 0 adds r0, r1, 0
@ -546,7 +546,7 @@ Window_FreeMemory: ; 8003604
ldr r1, [r4] ldr r1, [r4]
cmp r1, 0 cmp r1, 0
beq @08003620 beq @08003620
ldr r0, =nullsub_8 + 1 ldr r0, =nullsub_8
cmp r1, r0 cmp r1, r0
beq @08003620 beq @08003620
adds r0, r1, 0 adds r0, r1, 0
@ -2305,7 +2305,7 @@ Window_AddFromTemplate8Bpp: ; 8004260
lsls r1, r7, 2 lsls r1, r7, 2
adds r5, r1, r0 adds r5, r1, r0
ldr r1, [r5] ldr r1, [r5]
ldr r0, =nullsub_9 + 1 ldr r0, =nullsub_9
cmp r1, r0 cmp r1, r0
beq @08004322 beq @08004322
adds r0, r1, 0 adds r0, r1, 0

96
data/contest_effect_function_table.s
View File

@ -1,51 +1,51 @@
.align 2, 0 .align 2, 0
gContestEffectFunctionTable: ; 858CECC gContestEffectFunctionTable: ; 858CECC
.4byte ContestEffectFunc_080E547C + 1 .4byte ContestEffectFunc_080E547C
.4byte ContestEffectFunc_080E5480 + 1 .4byte ContestEffectFunc_080E5480
.4byte ContestEffectFunc_080E54B0 + 1 .4byte ContestEffectFunc_080E54B0
.4byte ContestEffectFunc_080E54E0 + 1 .4byte ContestEffectFunc_080E54E0
.4byte ContestEffectFunc_080E5534 + 1 .4byte ContestEffectFunc_080E5534
.4byte ContestEffectFunc_080E5560 + 1 .4byte ContestEffectFunc_080E5560
.4byte ContestEffectFunc_080E5590 + 1 .4byte ContestEffectFunc_080E5590
.4byte ContestEffectFunc_080E55BC + 1 .4byte ContestEffectFunc_080E55BC
.4byte ContestEffectFunc_080E55EC + 1 .4byte ContestEffectFunc_080E55EC
.4byte ContestEffectFunc_080E5664 + 1 .4byte ContestEffectFunc_080E5664
.4byte ContestEffectFunc_080E55EC + 1 .4byte ContestEffectFunc_080E55EC
.4byte ContestEffectFunc_080E5664 + 1 .4byte ContestEffectFunc_080E5664
.4byte ContestEffectFunc_080E55EC + 1 .4byte ContestEffectFunc_080E55EC
.4byte ContestEffectFunc_080E5664 + 1 .4byte ContestEffectFunc_080E5664
.4byte ContestEffectFunc_080E56E0 + 1 .4byte ContestEffectFunc_080E56E0
.4byte ContestEffectFunc_080E5718 + 1 .4byte ContestEffectFunc_080E5718
.4byte ContestEffectFunc_080E57CC + 1 .4byte ContestEffectFunc_080E57CC
.4byte ContestEffectFunc_080E588C + 1 .4byte ContestEffectFunc_080E588C
.4byte ContestEffectFunc_080E5938 + 1 .4byte ContestEffectFunc_080E5938
.4byte ContestEffectFunc_080E5970 + 1 .4byte ContestEffectFunc_080E5970
.4byte ContestEffectFunc_080E59B0 + 1 .4byte ContestEffectFunc_080E59B0
.4byte ContestEffectFunc_080E59D0 + 1 .4byte ContestEffectFunc_080E59D0
.4byte ContestEffectFunc_080E59F0 + 1 .4byte ContestEffectFunc_080E59F0
.4byte ContestEffectFunc_080E5A10 + 1 .4byte ContestEffectFunc_080E5A10
.4byte ContestEffectFunc_080E5A30 + 1 .4byte ContestEffectFunc_080E5A30
.4byte ContestEffectFunc_080E5A50 + 1 .4byte ContestEffectFunc_080E5A50
.4byte ContestEffectFunc_080E5AD4 + 1 .4byte ContestEffectFunc_080E5AD4
.4byte ContestEffectFunc_080E5CD4 + 1 .4byte ContestEffectFunc_080E5CD4
.4byte ContestEffectFunc_080E5D7C + 1 .4byte ContestEffectFunc_080E5D7C
.4byte ContestEffectFunc_080E5E04 + 1 .4byte ContestEffectFunc_080E5E04
.4byte ContestEffectFunc_080E5E5C + 1 .4byte ContestEffectFunc_080E5E5C
.4byte ContestEffectFunc_080E5EB4 + 1 .4byte ContestEffectFunc_080E5EB4
.4byte ContestEffectFunc_080E5F64 + 1 .4byte ContestEffectFunc_080E5F64
.4byte ContestEffectFunc_080E5FE4 + 1 .4byte ContestEffectFunc_080E5FE4
.4byte ContestEffectFunc_080E6068 + 1 .4byte ContestEffectFunc_080E6068
.4byte ContestEffectFunc_080E611C + 1 .4byte ContestEffectFunc_080E611C
.4byte ContestEffectFunc_080E620C + 1 .4byte ContestEffectFunc_080E620C
.4byte ContestEffectFunc_080E62B8 + 1 .4byte ContestEffectFunc_080E62B8
.4byte ContestEffectFunc_080E6334 + 1 .4byte ContestEffectFunc_080E6334
.4byte ContestEffectFunc_080E6398 + 1 .4byte ContestEffectFunc_080E6398
.4byte ContestEffectFunc_080E63E8 + 1 .4byte ContestEffectFunc_080E63E8
.4byte ContestEffectFunc_080E6520 + 1 .4byte ContestEffectFunc_080E6520
.4byte ContestEffectFunc_080E6664 + 1 .4byte ContestEffectFunc_080E6664
.4byte ContestEffectFunc_080E6668 + 1 .4byte ContestEffectFunc_080E6668
.4byte ContestEffectFunc_080E6778 + 1 .4byte ContestEffectFunc_080E6778
.4byte ContestEffectFunc_080E67BC + 1 .4byte ContestEffectFunc_080E67BC
.4byte ContestEffectFunc_080E6868 + 1 .4byte ContestEffectFunc_080E6868
.4byte ContestEffectFunc_080E68EC + 1 .4byte ContestEffectFunc_080E68EC