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

update disasm with function data from idb

Browse Source
This commit is contained in:
YamaArashi 2016-01-03 07:04:11 -08:00
parent 50fb956024
commit b116b3cb2e
8 changed files with 3212 additions and 3015 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5303
asm/emerald.s
View File

File diff suppressed because it is too large Load Diff

18
asm/gpu_obj.s
View File

@ -3365,9 +3365,9 @@ SeekObjectImageAnim: ; 80081DC
bx r0
thumb_func_end SeekObjectImageAnim
thumb_func_start sub_8008258
; void sub_8008258(u8 index, u8 a2)
sub_8008258: ; 8008258
thumb_func_start StartObjectRotScalAnim
; void StartObjectRotScalAnim(struct obj *object, u8 whichAnim)
StartObjectRotScalAnim: ; 8008258
push {r4,r5,lr}
adds r5, r0, 0
lsls r4, r1, 24
@ -3388,11 +3388,11 @@ sub_8008258: ; 8008258
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end sub_8008258
thumb_func_end StartObjectRotScalAnim
thumb_func_start sub_8008284
; void sub_8008284(u8 index, u8 a2)
sub_8008284: ; 8008284
thumb_func_start StartObjectRotScalAnimIfDifferent
; void StartObjectRotScalAnimIfDifferent(struct obj *object, u8 whichAnim)
StartObjectRotScalAnimIfDifferent: ; 8008284
push {r4,r5,lr}
adds r5, r0, 0
lsls r1, 24
@ -3410,13 +3410,13 @@ sub_8008284: ; 8008284
beq @080082AC
adds r0, r5, 0
adds r1, r4, 0
bl sub_8008258
bl StartObjectRotScalAnim
@080082AC:
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_8008284
thumb_func_end StartObjectRotScalAnimIfDifferent
thumb_func_start sub_80082B8
sub_80082B8: ; 80082B8

32
asm/main_menu.s
View File

@ -1480,7 +1480,7 @@ Task_HandleMainMenuAPressed: ; 803027C
ldr r0, =0x030022c0
ldr r1, =CB2_ReinitMainMenu
str r1, [r0, 0x8]
ldr r0, =c2_options_menu
ldr r0, =CB2_OptionsMenu
b @0803048A
.pool
@08030478:
@ -2083,7 +2083,7 @@ task_new_game_prof_birch_speech_3: ; 8030928
ldr r1, =gUnknown_082C897B
bl ExpandStringRefs
movs r0, 0x1
bl get_map_name
bl AddTextPrinterForMessage
ldr r0, =task_new_game_prof_birch_speech_4
str r0, [r4]
@080309B6:
@ -2120,7 +2120,7 @@ task_new_game_prof_birch_speech_4: ; 80309CC
bl ExpandStringRefs
ldr r1, =sub_80323A0
movs r0, 0x1
bl sub_8197A9C
bl AddTextPrinterWithCallbackForMessage
ldr r0, =0x03000dd0
strb r4, [r0]
@08030A0A:
@ -2143,7 +2143,7 @@ task_new_game_prof_birch_speech_5: ; 8030A2C
ldr r1, =gUnknown_082C8A1F
bl ExpandStringRefs
movs r0, 0x1
bl get_map_name
bl AddTextPrinterForMessage
ldr r1, =0x03005e00
lsls r0, r4, 2
adds r0, r4
@ -2338,7 +2338,7 @@ task_new_game_prof_birch_speech_6: ; 8030BCC
ldr r1, =gUnknown_082C8BD0
bl ExpandStringRefs
movs r0, 0x1
bl get_map_name
bl AddTextPrinterForMessage
ldr r1, =0x03005e00
lsls r0, r4, 2
adds r0, r4
@ -2577,7 +2577,7 @@ task_new_game_prof_birch_speech_11: ; 8030DC8
ldr r1, =gUnknown_082C8BDD
bl ExpandStringRefs
movs r0, 0x1
bl get_map_name
bl AddTextPrinterForMessage
ldr r1, =0x03005e00
lsls r0, r4, 2
adds r0, r4
@ -2828,7 +2828,7 @@ task_new_game_prof_birch_speech_14: ; 8030FD4
ldr r1, =gUnknown_082C8BFF
bl ExpandStringRefs
movs r0, 0x1
bl get_map_name
bl AddTextPrinterForMessage
ldr r1, =0x03005e00
lsls r0, r4, 2
adds r0, r4
@ -2965,7 +2965,7 @@ task_new_game_prof_birch_speech_part2_2: ; 8031104
ldr r1, =gUnknown_082C8C1C
bl ExpandStringRefs
movs r0, 0x1
bl get_map_name
bl AddTextPrinterForMessage
ldr r1, =0x03005e00
lsls r0, r4, 2
adds r0, r4
@ -3208,7 +3208,7 @@ task_new_game_prof_birch_speech_part2_6: ; 8031258
ldr r1, =gUnknown_082C8C2A
bl ExpandStringRefs
movs r0, 0x1
bl get_map_name
bl AddTextPrinterForMessage
ldr r0, =task_new_game_prof_birch_speech_part2_7
str r0, [r7]
@08031320:
@ -3393,7 +3393,7 @@ task_new_game_prof_birch_speech_part2_8: ; 80313E4
ldr r1, =gUnknown_082C8C7A
bl ExpandStringRefs
movs r0, 0x1
bl get_map_name
bl AddTextPrinterForMessage
ldr r0, =task_new_game_prof_birch_speech_part2_9
str r0, [r4]
@080314B0:
@ -3459,7 +3459,7 @@ task_new_game_prof_birch_speech_part2_9: ; 80314C4
bl obj_alloc_rotscale_entry
adds r0, r5, 0
movs r1, 0
bl sub_8008258
bl StartObjectRotScalAnim
adds r0, r7, 0
adds r0, 0x1C
adds r4, r0
@ -3582,7 +3582,7 @@ task_new_game_prof_birch_speech_part2_12: ; 8031630
ldrh r0, [r0, 0x1A]
bl sub_818D820
bl dp13_810BB8C
ldr r0, =c2_new_game
ldr r0, =CB2_NewGame
bl SetMainCallback2
adds r0, r4, 0
bl remove_task
@ -4558,7 +4558,7 @@ fmt_time: ; 8031E94
ldr r1, [r4]
movs r0, 0x1
movs r2, 0x64
bl sub_81DB368
bl GetStringRightAlignXOffset
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@ -4614,7 +4614,7 @@ fmt_player: ; 8031EF8
movs r0, 0x1
add r1, sp, 0xC
movs r2, 0xD0
bl sub_81DB368
bl GetStringRightAlignXOffset
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@ -4679,7 +4679,7 @@ fmt_pokedex: ; 8031F7C
movs r0, 0x1
add r1, sp, 0xC
movs r2, 0x64
bl sub_81DB368
bl GetStringRightAlignXOffset
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@ -4743,7 +4743,7 @@ fmt_badges: ; 8032014
movs r0, 0x1
add r1, sp, 0xC
movs r2, 0xD0
bl sub_81DB368
bl GetStringRightAlignXOffset
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24

10
asm/malloc.s
View File

@ -1,5 +1,5 @@
thumb_func_start PutMemBlockHeader
; void PutMemBlockHeader(struct MemBlock *block, struct MemBlock *prev, struct MemBlock *next, u32 size)
; void PutMemBlockHeader(void *block, struct MemBlock *prev, struct MemBlock *next, u32 size)
PutMemBlockHeader: ; 8000988
push {r4,lr}
movs r4, 0
@ -16,7 +16,7 @@ PutMemBlockHeader: ; 8000988
thumb_func_end PutMemBlockHeader
thumb_func_start PutFirstMemBlockHeader
; void PutFirstMemBlockHeader(struct MemBlock *block, u32 size)
; void PutFirstMemBlockHeader(void *block, u32 size)
PutFirstMemBlockHeader: ; 80009A4
push {lr}
adds r2, r0, 0
@ -91,7 +91,7 @@ AllocInternal: ; 80009B8
thumb_func_end AllocInternal
thumb_func_start FreeInternal
; void FreeInternal(struct MemBlock *head, struct MemBlock *node)
; void FreeInternal(void *heapStart, void *pointer)
FreeInternal: ; 8000A20
push {r4,r5,lr}
cmp r1, 0
@ -148,7 +148,7 @@ FreeInternal: ; 8000A20
thumb_func_end FreeInternal
thumb_func_start AllocZeroedInternal
; void *AllocZeroedInternal(struct MemBlock *head, u32 size)
; void *AllocZeroedInternal(void *heapStart, u32 size)
AllocZeroedInternal: ; 8000A84
push {r4,r5,lr}
sub sp, 0x4
@ -289,7 +289,7 @@ Free: ; 8000B60
thumb_func_end Free
thumb_func_start CheckMemBlock
; BOOL CheckMemBlock(struct MemBlock *node)
; BOOL CheckMemBlock(void *pointer)
CheckMemBlock: ; 8000B74
push {lr}
adds r1, r0, 0

2
asm/text_renderer.s
View File

@ -3315,7 +3315,7 @@ GetFontWidthFunc: ; 8005EA8
thumb_func_end GetFontWidthFunc
thumb_func_start GetStringWidth
; u32 GetStringWidth(u8 fontId, u8 *str, u16 letterSpacing)
; s32 GetStringWidth(u8 fontId, u8 *str, u16 letterSpacing)
GetStringWidth: ; 8005ED8
push {r4-r7,lr}
mov r7, r10

2
asm/window.s
View File

@ -216,7 +216,7 @@ InitWindows: ; 80031C0
thumb_func_end InitWindows
thumb_func_start AddWindow
; u16 AddWindow(struct WindowTemplate *template)
; u8 AddWindow(struct WindowTemplate *template)
AddWindow: ; 8003380
push {r4-r7,lr}
mov r7, r10

6
data/event_script_command_function_table.s
View File

@ -112,7 +112,7 @@ gEventScriptCommandFunctionTable: ; 81DB67C
.4byte s6C_release_2
.4byte sub_809ACC0
.4byte s6E_yes_no
.4byte sub_809AD00
.4byte s6F_multichoice
.4byte sub_809AD3C
.4byte sub_809AD90
.4byte sub_809AD8C
@ -139,7 +139,7 @@ gEventScriptCommandFunctionTable: ; 81DB67C
.4byte s87_pokemartdecor
.4byte s88_pokemartbp
.4byte s89_open_casino_game1
.4byte sub_809B71C
.4byte berry_script_cmd
.4byte sub_809B784
.4byte sub_809B794
.4byte sub_809B7A4
@ -214,7 +214,7 @@ gEventScriptCommandFunctionTable: ; 81DB67C
.4byte sub_809BD70
.4byte sub_809BB90
.4byte sub_809BBB4
.4byte sub_809BBC0
.4byte ScrCmd_MossdeepGymSwitch
.4byte sub_809BBDC
.4byte sub_809A150
.4byte sub_809BBE8

854
data/items.s
View File

File diff suppressed because it is too large Load Diff