mirror of
https://github.com/pret/pokeheartgold.git
synced 2024-11-27 15:10:26 +00:00
Merge branch 'master' into overlay_50
This commit is contained in:
Abaresk
commit
7d9d990e69
@ -1,326 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "global.inc"
|
||||
|
||||
.rodata
|
||||
|
||||
_020F6AD0:
|
||||
.byte 0x00, 0x03, 0x03, 0x1A, 0x12, 0x01, 0x23, 0x00
|
||||
_020F6AD8:
|
||||
.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
_020F6AE8:
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x06, 0x00, 0x01, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00
|
||||
_020F6B04:
|
||||
.byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_0203A9DC
|
||||
sub_0203A9DC: ; 0x0203A9DC
|
||||
ldr r3, _0203A9F0 ; =0x027E0000
|
||||
ldr r1, _0203A9F4 ; =0x00003FF8
|
||||
mov r0, #1
|
||||
ldr r2, [r3, r1]
|
||||
orr r0, r2
|
||||
str r0, [r3, r1]
|
||||
ldr r3, _0203A9F8 ; =MI_WaitDma
|
||||
mov r0, #3
|
||||
bx r3
|
||||
nop
|
||||
_0203A9F0: .word 0x027E0000
|
||||
_0203A9F4: .word 0x00003FF8
|
||||
_0203A9F8: .word MI_WaitDma
|
||||
thumb_func_end sub_0203A9DC
|
||||
|
||||
thumb_func_start sub_0203A9FC
|
||||
sub_0203A9FC: ; 0x0203A9FC
|
||||
push {r3, r4, r5, lr}
|
||||
add r5, r0, #0
|
||||
bl sub_020393C8
|
||||
cmp r0, #0
|
||||
beq _0203AA10
|
||||
bl sub_02037D78
|
||||
cmp r0, #0
|
||||
bne _0203AA14
|
||||
_0203AA10:
|
||||
mov r0, #0
|
||||
pop {r3, r4, r5, pc}
|
||||
_0203AA14:
|
||||
bl sub_020392D8
|
||||
add r4, r0, #0
|
||||
ldr r0, [r4]
|
||||
ldr r1, [r4, #4]
|
||||
bl ov00_021E6A70
|
||||
ldr r1, [r4]
|
||||
cmp r0, #0xb
|
||||
str r1, [r5]
|
||||
beq _0203AA36
|
||||
cmp r0, #0xe
|
||||
bge _0203AA36
|
||||
ldr r0, [r4]
|
||||
sub r0, #0x19
|
||||
cmp r0, #1
|
||||
bhi _0203AA40
|
||||
_0203AA36:
|
||||
ldr r0, [r4, #4]
|
||||
cmp r0, #2
|
||||
beq _0203AA40
|
||||
mov r0, #0
|
||||
pop {r3, r4, r5, pc}
|
||||
_0203AA40:
|
||||
mov r0, #1
|
||||
pop {r3, r4, r5, pc}
|
||||
thumb_func_end sub_0203A9FC
|
||||
|
||||
thumb_func_start ShowCommunicationError
|
||||
ShowCommunicationError: ; 0x0203AA44
|
||||
push {r0, r1, r2, r3}
|
||||
push {r4, r5, r6, r7, lr}
|
||||
sub sp, #0x24
|
||||
add r4, r0, #0
|
||||
cmp r1, #6
|
||||
bhi _0203AA6A
|
||||
add r0, r1, r1
|
||||
add r0, pc
|
||||
ldrh r0, [r0, #6]
|
||||
lsl r0, r0, #0x10
|
||||
asr r0, r0, #0x10
|
||||
add pc, r0
|
||||
_0203AA5C: ; jump table
|
||||
.short _0203AA6A - _0203AA5C - 2 ; case 0
|
||||
.short _0203AA6E - _0203AA5C - 2 ; case 1
|
||||
.short _0203AA72 - _0203AA5C - 2 ; case 2
|
||||
.short _0203AA76 - _0203AA5C - 2 ; case 3
|
||||
.short _0203AA7A - _0203AA5C - 2 ; case 4
|
||||
.short _0203AA7E - _0203AA5C - 2 ; case 5
|
||||
.short _0203AA90 - _0203AA5C - 2 ; case 6
|
||||
_0203AA6A:
|
||||
mov r5, #1
|
||||
b _0203AAA0
|
||||
_0203AA6E:
|
||||
mov r5, #2
|
||||
b _0203AAA0
|
||||
_0203AA72:
|
||||
mov r5, #3
|
||||
b _0203AAA0
|
||||
_0203AA76:
|
||||
mov r5, #4
|
||||
b _0203AAA0
|
||||
_0203AA7A:
|
||||
mov r5, #5
|
||||
b _0203AAA0
|
||||
_0203AA7E:
|
||||
add r0, sp, #0x40
|
||||
bl sub_0203A9FC
|
||||
cmp r0, #0
|
||||
bne _0203AA8C
|
||||
mov r5, #6
|
||||
b _0203AAA0
|
||||
_0203AA8C:
|
||||
mov r5, #8
|
||||
b _0203AAA0
|
||||
_0203AA90:
|
||||
add r0, sp, #0x40
|
||||
bl sub_0203A9FC
|
||||
cmp r0, #0
|
||||
bne _0203AA9E
|
||||
mov r5, #7
|
||||
b _0203AAA0
|
||||
_0203AA9E:
|
||||
mov r5, #9
|
||||
_0203AAA0:
|
||||
mov r0, #0
|
||||
add r1, r0, #0
|
||||
bl sub_0200FBF4
|
||||
mov r0, #1
|
||||
mov r1, #0
|
||||
bl sub_0200FBF4
|
||||
mov r0, #1
|
||||
bl OS_DisableIrqMask
|
||||
ldr r1, _0203AC54 ; =sub_0203A9DC
|
||||
mov r0, #1
|
||||
bl OS_SetIrqFunction
|
||||
mov r0, #1
|
||||
bl OS_EnableIrqMask
|
||||
mov r0, #0
|
||||
add r1, r0, #0
|
||||
bl Main_SetVBlankIntrCB
|
||||
mov r0, #0
|
||||
add r1, r0, #0
|
||||
bl Main_SetHBlankIntrCB
|
||||
bl GX_DisableEngineALayers
|
||||
bl GX_DisableEngineBLayers
|
||||
mov r2, #1
|
||||
lsl r2, r2, #0x1a
|
||||
ldr r1, [r2]
|
||||
ldr r0, _0203AC58 ; =0xFFFFE0FF
|
||||
and r1, r0
|
||||
str r1, [r2]
|
||||
ldr r2, _0203AC5C ; =0x04001000
|
||||
ldr r1, [r2]
|
||||
and r0, r1
|
||||
str r0, [r2]
|
||||
mov r0, #4
|
||||
mov r1, #8
|
||||
bl SetKeyRepeatTimers
|
||||
ldr r0, _0203AC60 ; =gSystem + 0x60
|
||||
mov r1, #0
|
||||
strb r1, [r0, #9]
|
||||
bl GX_SwapDisplay
|
||||
ldr r3, _0203AC64 ; =0x04000050
|
||||
mov r1, #0
|
||||
strh r1, [r3]
|
||||
ldr r0, _0203AC68 ; =0x04001050
|
||||
sub r3, #0x50
|
||||
strh r1, [r0]
|
||||
ldr r2, [r3]
|
||||
ldr r1, _0203AC6C ; =0xFFFF1FFF
|
||||
sub r0, #0x50
|
||||
and r2, r1
|
||||
str r2, [r3]
|
||||
ldr r2, [r0]
|
||||
and r1, r2
|
||||
str r1, [r0]
|
||||
ldr r0, _0203AC70 ; =_020F6B04
|
||||
bl GX_SetBanks
|
||||
add r0, r4, #0
|
||||
bl BgConfig_Alloc
|
||||
add r6, r0, #0
|
||||
ldr r0, _0203AC74 ; =_020F6AD8
|
||||
bl SetBothScreensModesAndDisable
|
||||
mov r1, #0
|
||||
ldr r2, _0203AC78 ; =_020F6AE8
|
||||
add r0, r6, #0
|
||||
add r3, r1, #0
|
||||
bl InitBgFromTemplate
|
||||
add r0, r6, #0
|
||||
mov r1, #0
|
||||
bl BgClearTilemapBufferAndCommit
|
||||
mov r1, #0
|
||||
str r1, [sp]
|
||||
ldr r2, _0203AC7C ; =0x000001F7
|
||||
add r0, r6, #0
|
||||
mov r3, #2
|
||||
str r4, [sp, #4]
|
||||
bl sub_0200E3DC
|
||||
mov r0, #0
|
||||
mov r1, #0x20
|
||||
add r2, r4, #0
|
||||
bl sub_02003030
|
||||
mov r0, #0
|
||||
mov r1, #0x20
|
||||
add r2, r0, #0
|
||||
add r3, r4, #0
|
||||
bl BG_ClearCharDataRange
|
||||
ldr r1, _0203AC80 ; =0x00006C21
|
||||
mov r0, #0
|
||||
bl BG_SetMaskColor
|
||||
ldr r1, _0203AC80 ; =0x00006C21
|
||||
mov r0, #4
|
||||
bl BG_SetMaskColor
|
||||
mov r0, #1
|
||||
mov r1, #0x1b
|
||||
mov r2, #0x29
|
||||
add r3, r4, #0
|
||||
bl NewMsgDataFromNarc
|
||||
str r0, [sp, #0xc]
|
||||
mov r0, #6
|
||||
lsl r0, r0, #6
|
||||
add r1, r4, #0
|
||||
bl String_ctor
|
||||
add r7, r0, #0
|
||||
mov r0, #6
|
||||
lsl r0, r0, #6
|
||||
add r1, r4, #0
|
||||
bl String_ctor
|
||||
str r0, [sp, #0x10]
|
||||
bl sub_02020080
|
||||
add r0, r4, #0
|
||||
bl ScrStrBufs_new
|
||||
add r4, r0, #0
|
||||
ldr r2, _0203AC84 ; =_020F6AD0
|
||||
add r0, r6, #0
|
||||
add r1, sp, #0x14
|
||||
bl AddWindow
|
||||
mov r0, #0xd0
|
||||
str r0, [sp]
|
||||
mov r0, #0x90
|
||||
mov r2, #0
|
||||
str r0, [sp, #4]
|
||||
add r0, sp, #0x14
|
||||
mov r1, #0xf
|
||||
add r3, r2, #0
|
||||
bl FillWindowPixelRect
|
||||
ldr r2, _0203AC7C ; =0x000001F7
|
||||
add r0, sp, #0x14
|
||||
mov r1, #0
|
||||
mov r3, #2
|
||||
bl DrawFrameAndWindow1
|
||||
mov r0, #2
|
||||
str r0, [sp]
|
||||
mov r0, #1
|
||||
str r0, [sp, #4]
|
||||
ldr r2, [sp, #0x40]
|
||||
add r0, r4, #0
|
||||
mov r1, #0
|
||||
mov r3, #5
|
||||
bl BufferIntegerAsString
|
||||
ldr r0, [sp, #0xc]
|
||||
ldr r2, [sp, #0x10]
|
||||
add r1, r5, #0
|
||||
bl ReadMsgDataIntoString
|
||||
ldr r2, [sp, #0x10]
|
||||
add r0, r4, #0
|
||||
add r1, r7, #0
|
||||
bl StringExpandPlaceholders
|
||||
mov r1, #0
|
||||
str r1, [sp]
|
||||
str r1, [sp, #4]
|
||||
add r0, sp, #0x14
|
||||
add r2, r7, #0
|
||||
add r3, r1, #0
|
||||
str r1, [sp, #8]
|
||||
bl AddTextPrinterParameterized
|
||||
add r0, r7, #0
|
||||
bl String_dtor
|
||||
bl GX_BothDispOn
|
||||
mov r0, #0
|
||||
bl SetMasterBrightnessNeutral
|
||||
mov r0, #1
|
||||
bl SetMasterBrightnessNeutral
|
||||
mov r0, #0
|
||||
mov r1, #0x3f
|
||||
mov r2, #3
|
||||
bl SetBlendBrightness
|
||||
add r0, sp, #0x14
|
||||
bl RemoveWindow
|
||||
ldr r0, [sp, #0xc]
|
||||
bl DestroyMsgData
|
||||
add r0, r4, #0
|
||||
bl ScrStrBufs_delete
|
||||
add r0, r6, #0
|
||||
bl FreeToHeap
|
||||
add sp, #0x24
|
||||
pop {r4, r5, r6, r7}
|
||||
pop {r3}
|
||||
add sp, #0x10
|
||||
bx r3
|
||||
.balign 4, 0
|
||||
_0203AC54: .word sub_0203A9DC
|
||||
_0203AC58: .word 0xFFFFE0FF
|
||||
_0203AC5C: .word 0x04001000
|
||||
_0203AC60: .word gSystem + 0x60
|
||||
_0203AC64: .word 0x04000050
|
||||
_0203AC68: .word 0x04001050
|
||||
_0203AC6C: .word 0xFFFF1FFF
|
||||
_0203AC70: .word _020F6B04
|
||||
_0203AC74: .word _020F6AD8
|
||||
_0203AC78: .word _020F6AE8
|
||||
_0203AC7C: .word 0x000001F7
|
||||
_0203AC80: .word 0x00006C21
|
||||
_0203AC84: .word _020F6AD0
|
||||
thumb_func_end ShowCommunicationError
|
||||
@ -1,291 +0,0 @@
|
||||
#include "constants/easy_chat.h"
|
||||
#include "constants/items.h"
|
||||
#include "constants/maps.h"
|
||||
#include "constants/moves.h"
|
||||
#include "constants/species.h"
|
||||
#include "msgdata/msg/msg_0041.h"
|
||||
.include "asm/macros.inc"
|
||||
.include "global.inc"
|
||||
|
||||
.bss
|
||||
|
||||
_021D43B4:
|
||||
.space 4
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_02096318
|
||||
sub_02096318: ; 0x02096318
|
||||
ldr r3, _0209632C ; =OS_IRQTable
|
||||
ldr r1, _02096330 ; =0x00003FF8
|
||||
mov r0, #1
|
||||
ldr r2, [r3, r1]
|
||||
orr r0, r2
|
||||
str r0, [r3, r1]
|
||||
ldr r3, _02096334 ; =MI_WaitDma
|
||||
mov r0, #3
|
||||
bx r3
|
||||
nop
|
||||
_0209632C: .word OS_IRQTable
|
||||
_02096330: .word 0x00003FF8
|
||||
_02096334: .word MI_WaitDma
|
||||
thumb_func_end sub_02096318
|
||||
|
||||
thumb_func_start PrintErrorMessageAndReset
|
||||
PrintErrorMessageAndReset: ; 0x02096338
|
||||
push {r4, r5, r6, r7, lr}
|
||||
sub sp, #0x24
|
||||
ldr r0, _02096548 ; =_021D43B4
|
||||
ldr r1, [r0]
|
||||
cmp r1, #1
|
||||
bne _02096346
|
||||
b _02096544
|
||||
_02096346:
|
||||
mov r1, #1
|
||||
str r1, [r0]
|
||||
mov r0, #0
|
||||
bl OS_GetInitArenaHi
|
||||
add r1, r0, #0
|
||||
mov r0, #0
|
||||
bl OS_SetArenaHi
|
||||
mov r0, #0
|
||||
bl OS_GetInitArenaLo
|
||||
add r1, r0, #0
|
||||
mov r0, #0
|
||||
bl OS_SetArenaLo
|
||||
mov r1, #1
|
||||
ldr r0, _0209654C ; =_02108528
|
||||
add r2, r1, #0
|
||||
mov r3, #0
|
||||
bl InitHeapSystem
|
||||
mov r0, #0
|
||||
add r1, r0, #0
|
||||
bl sub_0200FBF4
|
||||
mov r0, #1
|
||||
mov r1, #0
|
||||
bl sub_0200FBF4
|
||||
mov r0, #1
|
||||
bl OS_DisableIrqMask
|
||||
ldr r1, _02096550 ; =sub_02096318
|
||||
mov r0, #1
|
||||
bl OS_SetIrqFunction
|
||||
mov r0, #1
|
||||
bl OS_EnableIrqMask
|
||||
mov r0, #0
|
||||
add r1, r0, #0
|
||||
bl Main_SetVBlankIntrCB
|
||||
mov r0, #0
|
||||
add r1, r0, #0
|
||||
bl Main_SetHBlankIntrCB
|
||||
bl GX_DisableEngineALayers
|
||||
bl GX_DisableEngineBLayers
|
||||
mov r2, #1
|
||||
lsl r2, r2, #0x1a
|
||||
ldr r1, [r2]
|
||||
ldr r0, _02096554 ; =0xFFFFE0FF
|
||||
and r1, r0
|
||||
str r1, [r2]
|
||||
ldr r2, _02096558 ; =0x04001000
|
||||
ldr r1, [r2]
|
||||
and r0, r1
|
||||
str r0, [r2]
|
||||
mov r0, #4
|
||||
mov r1, #8
|
||||
bl SetKeyRepeatTimers
|
||||
ldr r0, _0209655C ; =gSystem + 0x60
|
||||
mov r1, #0
|
||||
strb r1, [r0, #9]
|
||||
bl GX_SwapDisplay
|
||||
ldr r3, _02096560 ; =0x04000050
|
||||
mov r0, #0
|
||||
strh r0, [r3]
|
||||
ldr r2, _02096564 ; =0x04001050
|
||||
sub r3, #0x50
|
||||
strh r0, [r2]
|
||||
ldr r1, [r3]
|
||||
ldr r0, _02096568 ; =0xFFFF1FFF
|
||||
sub r2, #0x50
|
||||
and r1, r0
|
||||
str r1, [r3]
|
||||
ldr r1, [r2]
|
||||
and r0, r1
|
||||
str r0, [r2]
|
||||
ldr r0, _0209656C ; =_0210855C
|
||||
bl GX_SetBanks
|
||||
mov r0, #0
|
||||
bl BgConfig_Alloc
|
||||
str r0, [sp, #0x10]
|
||||
ldr r0, _02096570 ; =_02108530
|
||||
bl SetBothScreensModesAndDisable
|
||||
mov r1, #0
|
||||
ldr r0, [sp, #0x10]
|
||||
ldr r2, _02096574 ; =_02108540
|
||||
add r3, r1, #0
|
||||
bl InitBgFromTemplate
|
||||
ldr r0, [sp, #0x10]
|
||||
mov r1, #0
|
||||
bl BgClearTilemapBufferAndCommit
|
||||
mov r1, #0
|
||||
str r1, [sp]
|
||||
ldr r0, [sp, #0x10]
|
||||
ldr r2, _02096578 ; =0x000001F7
|
||||
mov r3, #2
|
||||
str r1, [sp, #4]
|
||||
bl sub_0200E3DC
|
||||
mov r0, #0
|
||||
mov r1, #0x20
|
||||
add r2, r0, #0
|
||||
bl sub_02003030
|
||||
mov r0, #0
|
||||
mov r1, #0x20
|
||||
add r2, r0, #0
|
||||
add r3, r0, #0
|
||||
bl BG_ClearCharDataRange
|
||||
ldr r1, _0209657C ; =0x00006C21
|
||||
mov r0, #0
|
||||
bl BG_SetMaskColor
|
||||
ldr r1, _0209657C ; =0x00006C21
|
||||
mov r0, #4
|
||||
bl BG_SetMaskColor
|
||||
mov r0, #1
|
||||
mov r1, #0x1b
|
||||
mov r2, #0x29
|
||||
mov r3, #0
|
||||
bl NewMsgDataFromNarc
|
||||
str r0, [sp, #0xc]
|
||||
mov r0, #6
|
||||
lsl r0, r0, #6
|
||||
mov r1, #0
|
||||
bl String_ctor
|
||||
add r4, r0, #0
|
||||
bl sub_02020080
|
||||
ldr r0, [sp, #0x10]
|
||||
ldr r2, _02096580 ; =_02108520
|
||||
add r1, sp, #0x14
|
||||
bl AddWindow
|
||||
mov r0, #0xd0
|
||||
str r0, [sp]
|
||||
mov r0, #0x90
|
||||
mov r2, #0
|
||||
str r0, [sp, #4]
|
||||
add r0, sp, #0x14
|
||||
mov r1, #0xf
|
||||
add r3, r2, #0
|
||||
bl FillWindowPixelRect
|
||||
ldr r2, _02096578 ; =0x000001F7
|
||||
add r0, sp, #0x14
|
||||
mov r1, #0
|
||||
mov r3, #2
|
||||
bl DrawFrameAndWindow1
|
||||
ldr r0, [sp, #0xc]
|
||||
mov r1, #msg_0041_00003
|
||||
add r2, r4, #0
|
||||
bl ReadMsgDataIntoString
|
||||
mov r1, #0
|
||||
str r1, [sp]
|
||||
str r1, [sp, #4]
|
||||
add r0, sp, #0x14
|
||||
add r2, r4, #0
|
||||
add r3, r1, #0
|
||||
str r1, [sp, #8]
|
||||
bl AddTextPrinterParameterized
|
||||
add r0, r4, #0
|
||||
bl String_dtor
|
||||
bl GX_BothDispOn
|
||||
mov r0, #0
|
||||
bl SetMasterBrightnessNeutral
|
||||
mov r0, #1
|
||||
bl SetMasterBrightnessNeutral
|
||||
mov r0, #0
|
||||
mov r1, #0x3f
|
||||
mov r2, #3
|
||||
bl SetBlendBrightness
|
||||
bl sub_02038D90
|
||||
mov r4, #1
|
||||
_020964D8:
|
||||
bl HandleDSLidAction
|
||||
bl sub_02036144
|
||||
bl sub_02039AA4
|
||||
cmp r0, #0
|
||||
bne _020964F2
|
||||
add r0, r4, #0
|
||||
add r1, r4, #0
|
||||
bl OS_WaitIrq
|
||||
b _020964D8
|
||||
_020964F2:
|
||||
ldr r5, _02096584 ; =0x04000130
|
||||
ldr r4, _02096588 ; =0x027FFFA8
|
||||
ldr r7, _0209658C ; =0x00002FFF
|
||||
mov r6, #1
|
||||
_020964FA:
|
||||
bl HandleDSLidAction
|
||||
ldrh r1, [r5]
|
||||
ldrh r0, [r4]
|
||||
orr r1, r0
|
||||
ldr r0, _0209658C ; =0x00002FFF
|
||||
eor r0, r1
|
||||
and r0, r7
|
||||
lsl r0, r0, #0x10
|
||||
lsr r0, r0, #0x10
|
||||
tst r0, r6
|
||||
bne _0209651C
|
||||
mov r0, #1
|
||||
add r1, r0, #0
|
||||
bl OS_WaitIrq
|
||||
b _020964FA
|
||||
_0209651C:
|
||||
ldr r1, _02096590 ; =0x00007FFF
|
||||
mov r0, #0
|
||||
bl sub_0200FBF4
|
||||
ldr r1, _02096590 ; =0x00007FFF
|
||||
mov r0, #1
|
||||
bl sub_0200FBF4
|
||||
add r0, sp, #0x14
|
||||
bl RemoveWindow
|
||||
ldr r0, [sp, #0xc]
|
||||
bl DestroyMsgData
|
||||
ldr r0, [sp, #0x10]
|
||||
bl FreeToHeap
|
||||
mov r0, #0
|
||||
bl OS_ResetSystem
|
||||
_02096544:
|
||||
add sp, #0x24
|
||||
pop {r4, r5, r6, r7, pc}
|
||||
.balign 4, 0
|
||||
_02096548: .word _021D43B4
|
||||
_0209654C: .word _02108528
|
||||
_02096550: .word sub_02096318
|
||||
_02096554: .word 0xFFFFE0FF
|
||||
_02096558: .word 0x04001000
|
||||
_0209655C: .word gSystem + 0x60
|
||||
_02096560: .word 0x04000050
|
||||
_02096564: .word 0x04001050
|
||||
_02096568: .word 0xFFFF1FFF
|
||||
_0209656C: .word _0210855C
|
||||
_02096570: .word _02108530
|
||||
_02096574: .word _02108540
|
||||
_02096578: .word 0x000001F7
|
||||
_0209657C: .word 0x00006C21
|
||||
_02096580: .word _02108520
|
||||
_02096584: .word 0x04000130
|
||||
_02096588: .word 0x027FFFA8
|
||||
_0209658C: .word 0x00002FFF
|
||||
_02096590: .word 0x00007FFF
|
||||
thumb_func_end PrintErrorMessageAndReset
|
||||
|
||||
.rodata
|
||||
|
||||
_02108520:
|
||||
.byte 0x00, 0x03, 0x03, 0x1A, 0x12, 0x01, 0x23, 0x00
|
||||
_02108528:
|
||||
.byte 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
_02108530:
|
||||
.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
_02108540:
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x01, 0x00, 0x00, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
_0210855C:
|
||||
.byte 0x03, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00
|
||||
@ -1,181 +0,0 @@
|
||||
#include "constants/easy_chat.h"
|
||||
#include "constants/items.h"
|
||||
#include "constants/maps.h"
|
||||
#include "constants/moves.h"
|
||||
#include "constants/species.h"
|
||||
.include "asm/macros.inc"
|
||||
.include "global.inc"
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start MoveRelearner_new
|
||||
MoveRelearner_new: ; 0x0209174C
|
||||
push {r3, lr}
|
||||
mov r1, #0x1c
|
||||
bl AllocFromHeap
|
||||
add r3, r0, #0
|
||||
mov r2, #0x1c
|
||||
mov r1, #0
|
||||
_0209175A:
|
||||
strb r1, [r3]
|
||||
add r3, r3, #1
|
||||
sub r2, r2, #1
|
||||
bne _0209175A
|
||||
pop {r3, pc}
|
||||
thumb_func_end MoveRelearner_new
|
||||
|
||||
thumb_func_start MoveRelearner_delete
|
||||
MoveRelearner_delete: ; 0x02091764
|
||||
ldr r3, _02091768 ; =FreeToHeap
|
||||
bx r3
|
||||
.balign 4, 0
|
||||
_02091768: .word FreeToHeap
|
||||
thumb_func_end MoveRelearner_delete
|
||||
|
||||
thumb_func_start GetEligibleLevelUpMoves
|
||||
GetEligibleLevelUpMoves: ; 0x0209176C
|
||||
push {r3, r4, r5, r6, r7, lr}
|
||||
sub sp, #0x18
|
||||
str r1, [sp]
|
||||
mov r1, #5
|
||||
mov r2, #0
|
||||
add r5, r0, #0
|
||||
bl GetMonData
|
||||
lsl r0, r0, #0x10
|
||||
lsr r0, r0, #0x10
|
||||
str r0, [sp, #0xc]
|
||||
add r0, r5, #0
|
||||
mov r1, #0x70
|
||||
mov r2, #0
|
||||
bl GetMonData
|
||||
lsl r0, r0, #0x18
|
||||
lsr r0, r0, #0x18
|
||||
str r0, [sp, #8]
|
||||
add r0, r5, #0
|
||||
mov r1, #0xa1
|
||||
mov r2, #0
|
||||
bl GetMonData
|
||||
lsl r0, r0, #0x18
|
||||
lsr r0, r0, #0x18
|
||||
mov r4, #0
|
||||
str r0, [sp, #4]
|
||||
add r7, r4, #0
|
||||
add r6, sp, #0x10
|
||||
_020917A8:
|
||||
add r1, r4, #0
|
||||
add r0, r5, #0
|
||||
add r1, #0x36
|
||||
add r2, r7, #0
|
||||
bl GetMonData
|
||||
lsl r1, r4, #1
|
||||
strh r0, [r6, r1]
|
||||
add r0, r4, #1
|
||||
lsl r0, r0, #0x18
|
||||
lsr r4, r0, #0x18
|
||||
cmp r4, #4
|
||||
blo _020917A8
|
||||
ldr r0, [sp]
|
||||
mov r1, #0x2a
|
||||
bl AllocFromHeap
|
||||
add r7, r0, #0
|
||||
ldr r0, [sp]
|
||||
mov r1, #0x2a
|
||||
bl AllocFromHeap
|
||||
add r4, r0, #0
|
||||
ldr r0, [sp, #0xc]
|
||||
ldr r1, [sp, #8]
|
||||
add r2, r7, #0
|
||||
bl LoadWotbl_HandleAlternateForme
|
||||
mov r2, #0
|
||||
mov ip, r2
|
||||
_020917E4:
|
||||
mov r0, ip
|
||||
lsl r0, r0, #1
|
||||
ldrh r5, [r7, r0]
|
||||
ldr r6, _02091868 ; =0x0000FFFF
|
||||
cmp r5, r6
|
||||
bne _020917F6
|
||||
lsl r0, r2, #1
|
||||
strh r6, [r4, r0]
|
||||
b _0209185C
|
||||
_020917F6:
|
||||
mov r1, #0xfe
|
||||
lsl r1, r1, #8
|
||||
and r1, r5
|
||||
asr r3, r1, #9
|
||||
ldr r1, [sp, #4]
|
||||
cmp r3, r1
|
||||
bgt _0209184E
|
||||
lsr r1, r6, #7
|
||||
and r1, r5
|
||||
strh r1, [r7, r0]
|
||||
ldrh r3, [r7, r0]
|
||||
mov r1, #0
|
||||
add r6, sp, #0x10
|
||||
_02091810:
|
||||
lsl r5, r1, #1
|
||||
ldrh r5, [r6, r5]
|
||||
cmp r3, r5
|
||||
beq _02091822
|
||||
add r1, r1, #1
|
||||
lsl r1, r1, #0x18
|
||||
lsr r1, r1, #0x18
|
||||
cmp r1, #4
|
||||
blo _02091810
|
||||
_02091822:
|
||||
cmp r1, #4
|
||||
bne _0209184E
|
||||
mov r1, #0
|
||||
cmp r2, #0
|
||||
bls _0209183E
|
||||
_0209182C:
|
||||
lsl r5, r1, #1
|
||||
ldrh r5, [r4, r5]
|
||||
cmp r5, r3
|
||||
beq _0209183E
|
||||
add r1, r1, #1
|
||||
lsl r1, r1, #0x18
|
||||
lsr r1, r1, #0x18
|
||||
cmp r1, r2
|
||||
blo _0209182C
|
||||
_0209183E:
|
||||
cmp r1, r2
|
||||
bne _0209184E
|
||||
ldrh r1, [r7, r0]
|
||||
lsl r0, r2, #1
|
||||
strh r1, [r4, r0]
|
||||
add r0, r2, #1
|
||||
lsl r0, r0, #0x18
|
||||
lsr r2, r0, #0x18
|
||||
_0209184E:
|
||||
mov r0, ip
|
||||
add r0, r0, #1
|
||||
lsl r0, r0, #0x18
|
||||
lsr r0, r0, #0x18
|
||||
mov ip, r0
|
||||
cmp r0, #0x15
|
||||
blo _020917E4
|
||||
_0209185C:
|
||||
add r0, r7, #0
|
||||
bl FreeToHeap
|
||||
add r0, r4, #0
|
||||
add sp, #0x18
|
||||
pop {r3, r4, r5, r6, r7, pc}
|
||||
.balign 4, 0
|
||||
_02091868: .word 0x0000FFFF
|
||||
thumb_func_end GetEligibleLevelUpMoves
|
||||
|
||||
thumb_func_start sub_0209186C
|
||||
sub_0209186C: ; 0x0209186C
|
||||
ldrh r1, [r0]
|
||||
ldr r0, _0209187C ; =0x0000FFFF
|
||||
cmp r1, r0
|
||||
beq _02091878
|
||||
mov r0, #1
|
||||
bx lr
|
||||
_02091878:
|
||||
mov r0, #0
|
||||
bx lr
|
||||
.balign 4, 0
|
||||
_0209187C: .word 0x0000FFFF
|
||||
thumb_func_end sub_0209186C
|
||||
File diff suppressed because it is too large
Load Diff
@ -811,7 +811,7 @@ sub_0205E680: ; 0x0205E680
|
||||
add r2, sp, #0
|
||||
bl sub_020611C8
|
||||
add r0, r5, #0
|
||||
bl sub_0205F968
|
||||
bl MapObject_GetPosVecYCoord
|
||||
str r0, [sp, #4]
|
||||
add r0, r5, #0
|
||||
bl sub_0205F8B8
|
||||
@ -822,7 +822,7 @@ sub_0205E680: ; 0x0205E680
|
||||
cmp r0, #0
|
||||
bne _0205E77C
|
||||
add r0, r5, #0
|
||||
bl sub_0205F968
|
||||
bl MapObject_GetPosVecYCoord
|
||||
str r0, [r4, #0x2c]
|
||||
b _0205E792
|
||||
_0205E77C:
|
||||
@ -831,7 +831,7 @@ _0205E77C:
|
||||
cmp r0, #1
|
||||
bne _0205E78E
|
||||
add r0, r5, #0
|
||||
bl sub_0205F968
|
||||
bl MapObject_GetPosVecYCoord
|
||||
str r0, [sp, #4]
|
||||
_0205E78E:
|
||||
ldr r0, [sp, #4]
|
||||
@ -3727,11 +3727,11 @@ MapObject_GetPositionVecPtr: ; 0x0205F964
|
||||
bx lr
|
||||
thumb_func_end MapObject_GetPositionVecPtr
|
||||
|
||||
thumb_func_start sub_0205F968
|
||||
sub_0205F968: ; 0x0205F968
|
||||
thumb_func_start MapObject_GetPosVecYCoord
|
||||
MapObject_GetPosVecYCoord: ; 0x0205F968
|
||||
ldr r0, [r0, #0x74]
|
||||
bx lr
|
||||
thumb_func_end sub_0205F968
|
||||
thumb_func_end MapObject_GetPosVecYCoord
|
||||
|
||||
thumb_func_start MapObject_GetFacingVec
|
||||
MapObject_GetFacingVec: ; 0x0205F96C
|
||||
@ -3814,7 +3814,7 @@ sub_0205F9C0: ; 0x0205F9C0
|
||||
thumb_func_start sub_0205F9D0
|
||||
sub_0205F9D0: ; 0x0205F9D0
|
||||
push {r3, lr}
|
||||
bl sub_0205F968
|
||||
bl MapObject_GetPosVecYCoord
|
||||
asr r1, r0, #3
|
||||
asr r0, r1, #0xb
|
||||
lsr r0, r0, #0x14
|
||||
|
||||
69
asm/font.s
69
asm/font.s
@ -4,31 +4,20 @@
|
||||
.rodata
|
||||
|
||||
_020F56C0:
|
||||
.byte 0x00, 0x00
|
||||
_020F56C2:
|
||||
.byte 0x00, 0x00
|
||||
_020F56C4:
|
||||
.byte 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
|
||||
.byte 0x04, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00
|
||||
.short 0x0000, 0x0000
|
||||
.short 0x0001, 0x0000
|
||||
.short 0x0002, 0x0000
|
||||
.short 0x0003, 0x0000
|
||||
.short 0x0004, 0x0000
|
||||
.short 0x000A, 0x0000
|
||||
_020F56D8:
|
||||
.byte 0x0B
|
||||
_020F56D9:
|
||||
.byte 0x10
|
||||
_020F56DA:
|
||||
.byte 0x00
|
||||
_020F56DB:
|
||||
.byte 0x00
|
||||
_020F56DC:
|
||||
.byte 0x00
|
||||
_020F56DD:
|
||||
.byte 0x01
|
||||
_020F56DE:
|
||||
.byte 0x0F
|
||||
_020F56DF:
|
||||
.byte 0x02
|
||||
.byte 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02, 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02
|
||||
.byte 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02, 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02
|
||||
.byte 0x0A, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02
|
||||
.byte 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02
|
||||
.byte 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02
|
||||
.byte 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02
|
||||
.byte 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02
|
||||
.byte 0x0A, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
|
||||
.bss
|
||||
|
||||
@ -89,7 +78,7 @@ sub_02002CEC: ; 0x02002CEC
|
||||
bne _02002D28
|
||||
str r1, [sp]
|
||||
ldr r1, _02002D38 ; =_020F56C0
|
||||
ldr r3, _02002D3C ; =_020F56C2
|
||||
ldr r3, _02002D3C ; =_020F56C0 + 2
|
||||
ldrh r1, [r1, r4]
|
||||
ldrh r3, [r3, r4]
|
||||
mov r0, #0x10 ; graphic/font.narc
|
||||
@ -115,7 +104,7 @@ _02002D28:
|
||||
nop
|
||||
_02002D34: .word _0211188C
|
||||
_02002D38: .word _020F56C0
|
||||
_02002D3C: .word _020F56C2
|
||||
_02002D3C: .word _020F56C0 + 2
|
||||
thumb_func_end sub_02002CEC
|
||||
|
||||
thumb_func_start sub_02002D40
|
||||
@ -479,50 +468,50 @@ _02002FCE:
|
||||
b _0200300C
|
||||
_02002FD6:
|
||||
lsl r1, r0, #3
|
||||
ldr r0, _02003014 ; =_020F56D9
|
||||
ldr r0, _02003014 ; =_020F56D8 + 1
|
||||
ldrb r2, [r0, r1]
|
||||
b _0200300C
|
||||
_02002FDE:
|
||||
lsl r1, r0, #3
|
||||
ldr r0, _02003018 ; =_020F56DA
|
||||
ldr r0, _02003018 ; =_020F56D8 + 2
|
||||
ldrb r2, [r0, r1]
|
||||
b _0200300C
|
||||
_02002FE6:
|
||||
lsl r1, r0, #3
|
||||
ldr r0, _0200301C ; =_020F56DB
|
||||
ldr r0, _0200301C ; =_020F56D8 + 3
|
||||
ldrb r2, [r0, r1]
|
||||
b _0200300C
|
||||
_02002FEE:
|
||||
lsl r1, r0, #3
|
||||
ldr r0, _02003020 ; =_020F56DC
|
||||
ldr r0, _02003020 ; =_020F56D8 + 4
|
||||
ldrb r2, [r0, r1]
|
||||
b _0200300C
|
||||
_02002FF6:
|
||||
lsl r1, r0, #3
|
||||
ldr r0, _02003024 ; =_020F56DD
|
||||
ldr r0, _02003024 ; =_020F56D8 + 5
|
||||
ldrb r2, [r0, r1]
|
||||
b _0200300C
|
||||
_02002FFE:
|
||||
lsl r1, r0, #3
|
||||
ldr r0, _02003028 ; =_020F56DE
|
||||
ldr r0, _02003028 ; =_020F56D8 + 6
|
||||
ldrb r2, [r0, r1]
|
||||
b _0200300C
|
||||
_02003006:
|
||||
lsl r1, r0, #3
|
||||
ldr r0, _0200302C ; =_020F56DF
|
||||
ldr r0, _0200302C ; =_020F56D8 + 7
|
||||
ldrb r2, [r0, r1]
|
||||
_0200300C:
|
||||
add r0, r2, #0
|
||||
bx lr
|
||||
.balign 4, 0
|
||||
_02003010: .word _020F56D8
|
||||
_02003014: .word _020F56D9
|
||||
_02003018: .word _020F56DA
|
||||
_0200301C: .word _020F56DB
|
||||
_02003020: .word _020F56DC
|
||||
_02003024: .word _020F56DD
|
||||
_02003028: .word _020F56DE
|
||||
_0200302C: .word _020F56DF
|
||||
_02003014: .word _020F56D8 + 1
|
||||
_02003018: .word _020F56D8 + 2
|
||||
_0200301C: .word _020F56D8 + 3
|
||||
_02003020: .word _020F56D8 + 4
|
||||
_02003024: .word _020F56D8 + 5
|
||||
_02003028: .word _020F56D8 + 6
|
||||
_0200302C: .word _020F56D8 + 7
|
||||
thumb_func_end GetFontAttribute
|
||||
|
||||
thumb_func_start sub_02003030
|
||||
|
||||
2949
asm/get_egg.s
2949
asm/get_egg.s
File diff suppressed because it is too large
Load Diff
@ -3714,7 +3714,7 @@ _021E7732:
|
||||
mov r0, #0x42
|
||||
lsl r0, r0, #2
|
||||
ldr r0, [r5, r0]
|
||||
bl sub_0206A2C0
|
||||
bl FsysUnkSub108_MoveMoodTowardsNeutral
|
||||
_021E7746:
|
||||
mov r0, #0
|
||||
pop {r3, r4, r5, r6, r7, pc}
|
||||
@ -3891,7 +3891,7 @@ ov01_021E788C: ; 0x021E788C
|
||||
bl Sav2_DayCare_get
|
||||
add r1, r5, #0
|
||||
add r2, r4, #0
|
||||
bl sub_0206CD1C
|
||||
bl HandleDayCareStep
|
||||
cmp r0, #1
|
||||
bne _021E78CE
|
||||
ldr r0, [r4, #0xc]
|
||||
@ -26475,7 +26475,7 @@ _021F21A8:
|
||||
lsl r0, r0, #2
|
||||
ldr r0, [r1, r0]
|
||||
mov r1, #1
|
||||
bl sub_0206A1F4
|
||||
bl FsysUnkSub108_AddMonMood
|
||||
mov r1, #2
|
||||
b _021F21C6
|
||||
_021F21C4:
|
||||
@ -27121,7 +27121,7 @@ ov01_021F26CC: ; 0x021F26CC
|
||||
lsl r0, r0, #2
|
||||
ldr r0, [r1, r0]
|
||||
mov r1, #1
|
||||
bl sub_0206A1F4
|
||||
bl FsysUnkSub108_AddMonMood
|
||||
mov r1, #2
|
||||
b _021F26F0
|
||||
_021F26EE:
|
||||
@ -37794,7 +37794,7 @@ _021F7636:
|
||||
ldr r0, [r0, r1]
|
||||
ldr r1, [sp, #0xc]
|
||||
lsr r2, r2, #0x10
|
||||
bl sub_0206A288
|
||||
bl FsysUnkSub108_Set
|
||||
_021F7654:
|
||||
add r0, r5, #0
|
||||
bl ov01_021FA2D4
|
||||
@ -49675,7 +49675,7 @@ ov01_021FCCB0: ; 0x021FCCB0
|
||||
ldr r1, [r4, #0x20]
|
||||
lsl r0, r0, #2
|
||||
ldr r0, [r1, r0]
|
||||
bl sub_0206A268
|
||||
bl FsysUnkSub108_GetMonMood
|
||||
mov r1, #9
|
||||
mvn r1, r1
|
||||
cmp r0, r1
|
||||
@ -50072,7 +50072,7 @@ _021FCF80:
|
||||
ldr r0, [r6, r0]
|
||||
mov r1, #1
|
||||
mov r5, #2
|
||||
bl sub_0206A1F4
|
||||
bl FsysUnkSub108_AddMonMood
|
||||
b _021FCF9E
|
||||
_021FCF9C:
|
||||
mov r5, #1
|
||||
@ -52808,7 +52808,7 @@ ov01_021FE3F8: ; 0x021FE3F8
|
||||
bl MapObject_GetPrevY
|
||||
str r0, [sp, #0x10]
|
||||
add r0, r5, #0
|
||||
bl sub_0205F968
|
||||
bl MapObject_GetPosVecYCoord
|
||||
add r6, r0, #0
|
||||
add r0, r5, #0
|
||||
bl MapObject_GetFacingDirection
|
||||
@ -54651,7 +54651,7 @@ _021FF188:
|
||||
lsl r0, r0, #0x10
|
||||
str r0, [sp, #8]
|
||||
ldr r0, [r4, #0x30]
|
||||
bl sub_0205F968
|
||||
bl MapObject_GetPosVecYCoord
|
||||
str r0, [sp, #4]
|
||||
ldr r0, [r4, #0x24]
|
||||
add r1, sp, #0
|
||||
@ -55747,7 +55747,7 @@ _021FFA08:
|
||||
lsl r0, r0, #0x10
|
||||
str r0, [sp, #8]
|
||||
ldr r0, [r4, #0x30]
|
||||
bl sub_0205F968
|
||||
bl MapObject_GetPosVecYCoord
|
||||
str r0, [sp, #4]
|
||||
ldr r0, [r4, #0x24]
|
||||
add r1, sp, #0
|
||||
@ -56091,7 +56091,7 @@ _021FFCBC:
|
||||
lsl r0, r0, #0x10
|
||||
str r0, [sp, #8]
|
||||
ldr r0, [r4, #0x30]
|
||||
bl sub_0205F968
|
||||
bl MapObject_GetPosVecYCoord
|
||||
str r0, [sp, #4]
|
||||
ldr r0, [r4, #0x24]
|
||||
add r1, sp, #0
|
||||
@ -60597,7 +60597,7 @@ ov01_02201F98: ; 0x02201F98
|
||||
bl FollowingPokemon_GetSpriteID
|
||||
lsl r5, r0, #1
|
||||
add r0, r7, #0
|
||||
bl sub_02069F64
|
||||
bl GetFollowPokeSizeParamBySpecies
|
||||
lsl r1, r0, #1
|
||||
add r0, r0, r1
|
||||
add r1, r6, r0
|
||||
@ -68295,10 +68295,10 @@ _02205A02:
|
||||
add r0, r5, #0
|
||||
add r0, #0xe4
|
||||
ldr r0, [r0]
|
||||
bl sub_02069F7C
|
||||
bl FollowPokeObj_GetSpecies
|
||||
ldr r1, [r5, #0x20]
|
||||
ldr r1, [r1]
|
||||
bl sub_02069FF4
|
||||
bl GetFollowPokePermissionBySpeciesAndMap
|
||||
cmp r0, #0
|
||||
bne _02205A2A
|
||||
add r0, r5, #0
|
||||
|
||||
@ -13833,7 +13833,7 @@ _0224C3F8:
|
||||
ldr r0, [r6, r0]
|
||||
mov r1, #1
|
||||
mov r4, #2
|
||||
bl sub_0206A1F4
|
||||
bl FsysUnkSub108_AddMonMood
|
||||
b _0224C420
|
||||
_0224C41E:
|
||||
mov r4, #1
|
||||
@ -14056,7 +14056,7 @@ _0224C5A4:
|
||||
ldr r0, [r6, r0]
|
||||
mov r1, #1
|
||||
mov r4, #2
|
||||
bl sub_0206A1F4
|
||||
bl FsysUnkSub108_AddMonMood
|
||||
b _0224C5CC
|
||||
_0224C5CA:
|
||||
mov r4, #1
|
||||
@ -20572,7 +20572,7 @@ ov02_0224F698: ; 0x0224F698
|
||||
mov r1, #0x42
|
||||
lsl r1, r1, #2
|
||||
ldr r0, [r0, r1]
|
||||
bl sub_0206A268
|
||||
bl FsysUnkSub108_GetMonMood
|
||||
strb r0, [r4, #0x15]
|
||||
pop {r4, pc}
|
||||
.balign 4, 0
|
||||
@ -21544,7 +21544,7 @@ _0224FDBC:
|
||||
cmp r0, #0
|
||||
beq _0224FDDC
|
||||
add r0, r4, #0
|
||||
bl sub_02069F7C
|
||||
bl FollowPokeObj_GetSpecies
|
||||
cmp r0, #0x32
|
||||
beq _0224FDDC
|
||||
cmp r0, #0x33
|
||||
@ -22474,7 +22474,7 @@ ov02_02250504: ; 0x02250504
|
||||
mov r0, #0x42
|
||||
lsl r0, r0, #2
|
||||
ldr r0, [r5, r0]
|
||||
bl sub_0206A268
|
||||
bl FsysUnkSub108_GetMonMood
|
||||
mov r1, #0x12
|
||||
str r0, [sp]
|
||||
lsl r1, r1, #4
|
||||
@ -22501,7 +22501,7 @@ _02250542:
|
||||
lsl r1, r1, #0x18
|
||||
ldr r0, [r5, r0]
|
||||
asr r1, r1, #0x18
|
||||
bl sub_0206A240
|
||||
bl FsysUnkSub108_SetMonMood
|
||||
add r0, r4, #0
|
||||
mov r1, #9
|
||||
mov r2, #0
|
||||
@ -22865,7 +22865,7 @@ ov02_022507B4: ; 0x022507B4
|
||||
add r0, #0xe4
|
||||
ldr r0, [r0]
|
||||
add r4, r1, #0
|
||||
bl sub_02069F7C
|
||||
bl FollowPokeObj_GetSpecies
|
||||
sub r0, #0x32
|
||||
cmp r0, #1
|
||||
bls _022507E0
|
||||
@ -26027,7 +26027,7 @@ _022520FC:
|
||||
cmp r0, #0
|
||||
bne _0225215A
|
||||
ldr r0, [sp, #0x1c]
|
||||
bl sub_02066E58
|
||||
bl ScriptState_IsInRocketTakeover
|
||||
cmp r0, #0
|
||||
bne _0225215A
|
||||
_02252134:
|
||||
|
||||
@ -3974,7 +3974,7 @@ ov05_0221D9F0: ; 0x0221D9F0
|
||||
mov r2, #4
|
||||
ldr r0, [r0, #0x24]
|
||||
add r3, r1, #0
|
||||
bl sub_02026EB4
|
||||
bl GF_3DVramMan_Create
|
||||
ldr r1, _0221DAC8 ; =0x00000B58
|
||||
ldr r2, _0221DACC ; =0x04000060
|
||||
str r0, [r4, r1]
|
||||
@ -4113,7 +4113,7 @@ ov05_0221DB18: ; 0x0221DB18
|
||||
bl FreeToHeap
|
||||
ldr r0, _0221DB48 ; =0x00000B58
|
||||
ldr r0, [r4, r0]
|
||||
bl sub_02026F54
|
||||
bl GF_3DVramMan_Delete
|
||||
_0221DB40:
|
||||
pop {r4, pc}
|
||||
nop
|
||||
@ -4643,7 +4643,7 @@ _0221DF58:
|
||||
mov r0, #0
|
||||
add r1, r0, #0
|
||||
add r2, r0, #0
|
||||
bl sub_020741BC
|
||||
bl GetMonIconNaixEx
|
||||
mov r1, #0x18
|
||||
add r2, r6, #0
|
||||
mul r2, r1
|
||||
@ -4663,7 +4663,7 @@ _0221DF7A:
|
||||
ldr r1, [sp, #4]
|
||||
add r4, r0, #0
|
||||
add r7, r1, r2
|
||||
bl sub_020741B0
|
||||
bl Pokemon_GetIconNaix
|
||||
mov r1, #0x85
|
||||
lsl r1, r1, #2
|
||||
str r0, [r7, r1]
|
||||
@ -4940,7 +4940,7 @@ _0221E19C:
|
||||
add r2, #0xb
|
||||
ldrb r1, [r3, r1]
|
||||
ldrb r2, [r3, r2]
|
||||
bl sub_02074364
|
||||
bl GetMonIconPaletteEx
|
||||
add r1, r0, #0
|
||||
ldr r0, [r7, r4]
|
||||
bl sub_0200DD10
|
||||
|
||||
@ -8844,7 +8844,7 @@ _022206E4:
|
||||
cmp r0, #0
|
||||
beq _0222070E
|
||||
ldr r0, [r5, #4]
|
||||
bl sub_020741B0
|
||||
bl Pokemon_GetIconNaix
|
||||
add r3, r0, #0
|
||||
mov r0, #0
|
||||
str r0, [sp]
|
||||
@ -8863,7 +8863,7 @@ _0222070E:
|
||||
mov r0, #0
|
||||
add r1, r0, #0
|
||||
add r2, r0, #0
|
||||
bl sub_020741BC
|
||||
bl GetMonIconNaixEx
|
||||
add r3, r0, #0
|
||||
mov r0, #0
|
||||
str r0, [sp]
|
||||
@ -9315,7 +9315,7 @@ _02220AB8:
|
||||
ldrb r1, [r1]
|
||||
lsl r2, r2, #0x18
|
||||
lsr r2, r2, #0x1f
|
||||
bl sub_02074364
|
||||
bl GetMonIconPaletteEx
|
||||
add r1, r0, #0
|
||||
ldr r0, _02220AE8 ; =0x00001FD4
|
||||
ldr r0, [r6, r0]
|
||||
|
||||
@ -23221,7 +23221,7 @@ _021F2AF2:
|
||||
pop {r3, r4, r5, r6, r7, pc}
|
||||
_021F2AF6:
|
||||
ldr r0, [r5, #0x28]
|
||||
bl sub_02066E58
|
||||
bl ScriptState_IsInRocketTakeover
|
||||
cmp r0, #0
|
||||
beq _021F2B04
|
||||
mov r0, #0x10
|
||||
@ -23638,7 +23638,7 @@ ov101_021F2DE8: ; 0x021F2DE8
|
||||
push {r4, lr}
|
||||
ldr r0, [r0, #0x28]
|
||||
add r4, r1, #0
|
||||
bl sub_02066E58
|
||||
bl ScriptState_IsInRocketTakeover
|
||||
cmp r0, #0
|
||||
beq _021F2DFE
|
||||
ldrb r0, [r4, #1]
|
||||
@ -25332,7 +25332,7 @@ ov101_021F3AA4: ; 0x021F3AA4
|
||||
add r1, #0x4a
|
||||
strb r0, [r1]
|
||||
ldr r0, [r5, #0x28]
|
||||
bl sub_02066E58
|
||||
bl ScriptState_IsInRocketTakeover
|
||||
cmp r0, #0
|
||||
beq _021F3AEC
|
||||
mov r0, #0x63
|
||||
@ -26368,7 +26368,7 @@ ov101_021F4274: ; 0x021F4274
|
||||
cmp r0, #0
|
||||
bne _021F42A4
|
||||
ldr r0, [r5, #0x28]
|
||||
bl sub_02066E58
|
||||
bl ScriptState_IsInRocketTakeover
|
||||
cmp r0, #0
|
||||
beq _021F4292
|
||||
mov r0, #0x9c
|
||||
@ -26906,7 +26906,7 @@ _021F4690:
|
||||
_021F46AE:
|
||||
ldr r0, [r4, #0xc]
|
||||
ldr r0, [r0, #0x2c]
|
||||
bl sub_02066E58
|
||||
bl ScriptState_IsInRocketTakeover
|
||||
cmp r0, #0
|
||||
beq _021F46BE
|
||||
mov r0, #5
|
||||
|
||||
@ -3166,7 +3166,7 @@ _021EE16C:
|
||||
mov r0, #0
|
||||
add r1, r0, #0
|
||||
add r2, r0, #0
|
||||
bl sub_020741BC
|
||||
bl GetMonIconNaixEx
|
||||
str r6, [sp]
|
||||
add r3, r0, #0
|
||||
str r7, [sp, #4]
|
||||
|
||||
@ -6620,7 +6620,7 @@ ov108_021E8CD4: ; 0x021E8CD4
|
||||
lsl r0, r0, #0x11
|
||||
mov r1, #0
|
||||
add r3, r6, #0
|
||||
bl sub_02026FE8
|
||||
bl GF_3DVramMan_InitLinkedListTexVramManager
|
||||
mov r0, #1
|
||||
lsl r0, r0, #8
|
||||
bl NNS_GfdGetLnkPlttVramManagerWorkSize
|
||||
@ -6638,7 +6638,7 @@ ov108_021E8CD4: ; 0x021E8CD4
|
||||
lsl r0, r0, #0xe
|
||||
add r2, r6, #0
|
||||
mov r3, #1
|
||||
bl sub_02026FF8
|
||||
bl GF_3DVramMan_InitLinkedListPlttVramManager
|
||||
add r0, r5, #4
|
||||
add r1, r4, #0
|
||||
mov r2, #0x20
|
||||
|
||||
@ -1202,7 +1202,7 @@ ov111_021E6268: ; 0x021E6268
|
||||
bl NARC_ctor
|
||||
add r7, r0, #0
|
||||
add r0, r4, #0
|
||||
bl sub_020741B0
|
||||
bl Pokemon_GetIconNaix
|
||||
add r1, r0, #0
|
||||
ldr r0, [sp, #4]
|
||||
mov r2, #0
|
||||
@ -1220,7 +1220,7 @@ ov111_021E6268: ; 0x021E6268
|
||||
ldr r0, [sp, #8]
|
||||
bl FreeToHeap
|
||||
add r0, r4, #0
|
||||
bl sub_02074484
|
||||
bl Pokemon_GetIconPalette
|
||||
add r0, r6, r0
|
||||
lsl r0, r0, #0x18
|
||||
lsr r1, r0, #0x18
|
||||
|
||||
@ -7113,7 +7113,7 @@ _021E945C:
|
||||
thumb_func_start ov112_021E9464
|
||||
ov112_021E9464: ; 0x021E9464
|
||||
push {r3, lr}
|
||||
bl sub_02074170
|
||||
bl Boxmon_GetIconNaix
|
||||
sub r0, r0, #7
|
||||
pop {r3, pc}
|
||||
.balign 4, 0
|
||||
@ -7124,7 +7124,7 @@ ov112_021E9470: ; 0x021E9470
|
||||
push {r3, lr}
|
||||
mov r1, #0
|
||||
add r2, r1, #0
|
||||
bl sub_020741BC
|
||||
bl GetMonIconNaixEx
|
||||
sub r0, r0, #7
|
||||
pop {r3, pc}
|
||||
.balign 4, 0
|
||||
@ -10000,7 +10000,7 @@ ov112_021EAB78: ; 0x021EAB78
|
||||
add r0, r6, #0
|
||||
mov r1, #0
|
||||
add r2, r7, #0
|
||||
bl sub_020741BC
|
||||
bl GetMonIconNaixEx
|
||||
ldr r3, _021EABDC ; =0x0001EA64
|
||||
add r1, r0, #0
|
||||
mov r0, #0x9a
|
||||
@ -10058,7 +10058,7 @@ ov112_021EABE8: ; 0x021EABE8
|
||||
add r0, r5, #0
|
||||
add r1, r4, #0
|
||||
add r2, r6, #0
|
||||
bl sub_02074364
|
||||
bl GetMonIconPaletteEx
|
||||
add r1, r0, #0
|
||||
ldr r0, [sp, #0x14]
|
||||
add r1, r1, #5
|
||||
@ -28425,8 +28425,8 @@ ov112_021F5718: ; 0x021F5718
|
||||
.byte 0x60, 0x60, 0x70, 0x70, 0x78, 0x78, 0x7C, 0x7C
|
||||
.byte 0x7C, 0x7C, 0x78, 0x78, 0x70, 0x70, 0x60, 0x60
|
||||
|
||||
.public ov112_021F5728
|
||||
ov112_021F5728:
|
||||
.public ov112_App_MainMenu_SelectOption_ConnectToPokewalker
|
||||
ov112_App_MainMenu_SelectOption_ConnectToPokewalker:
|
||||
.word ov112_021E76CC, ov112_021E7830, ov112_021E7910, 0xFFFFFFFF
|
||||
ov112_021F5738:
|
||||
.byte 0x00, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C
|
||||
|
||||
@ -1997,7 +1997,7 @@ _021E68B4:
|
||||
mov r0, #0xc9
|
||||
mov r1, #0
|
||||
add r2, r4, #0
|
||||
bl sub_020741BC
|
||||
bl GetMonIconNaixEx
|
||||
str r6, [sp]
|
||||
add r3, r0, #0
|
||||
add r1, r5, #0
|
||||
@ -2023,7 +2023,7 @@ _021E68EA:
|
||||
mov r0, #0xc9
|
||||
mov r1, #0
|
||||
add r2, r4, #0
|
||||
bl sub_020741BC
|
||||
bl GetMonIconNaixEx
|
||||
str r6, [sp]
|
||||
add r3, r0, #0
|
||||
add r1, r5, #0
|
||||
@ -2176,7 +2176,7 @@ _021E69D8:
|
||||
str r0, [sp, #0x30]
|
||||
mov r0, #0xc9
|
||||
add r2, r1, #0
|
||||
bl sub_02074364
|
||||
bl GetMonIconPaletteEx
|
||||
mov r4, #0
|
||||
str r0, [sp, #0x10]
|
||||
str r4, [sp, #0x34]
|
||||
@ -2282,7 +2282,7 @@ ov113_021E6AE8: ; 0x021E6AE8
|
||||
add r4, r1, #0
|
||||
mov r0, #0xc9
|
||||
mov r1, #0
|
||||
bl sub_020741BC
|
||||
bl GetMonIconNaixEx
|
||||
add r3, r0, #0
|
||||
mov r0, #0
|
||||
str r0, [sp]
|
||||
|
||||
349
asm/overlay_12.s
349
asm/overlay_12.s
File diff suppressed because it is too large
Load Diff
@ -79,7 +79,7 @@ _02260CB8:
|
||||
add r1, #0xa8
|
||||
str r0, [r1]
|
||||
mov r0, #0xb
|
||||
bl sub_0206A1D4
|
||||
bl FsysUnkSub108_Alloc
|
||||
mov r1, #0x42
|
||||
lsl r1, r1, #2
|
||||
str r0, [r5, r1]
|
||||
|
||||
@ -26818,7 +26818,7 @@ ov14_021F2DC4: ; 0x021F2DC4
|
||||
add r5, r0, #0
|
||||
add r0, r1, #0
|
||||
add r4, r2, #0
|
||||
bl sub_02074170
|
||||
bl Boxmon_GetIconNaix
|
||||
add r1, r0, #0
|
||||
mov r0, #0xa
|
||||
str r0, [sp]
|
||||
@ -26877,7 +26877,7 @@ _021F2E10:
|
||||
ldr r0, [sp, #8]
|
||||
bl FreeToHeap
|
||||
add r0, r7, #0
|
||||
bl sub_02074444
|
||||
bl Boxmon_GetIconPalette
|
||||
ldr r1, [r5, #0x34]
|
||||
add r2, r1, r4
|
||||
ldr r1, _021F2E70 ; =0x00004076
|
||||
@ -26935,7 +26935,7 @@ ov14_021F2EA0: ; 0x021F2EA0
|
||||
bl ov14_021F2DC4
|
||||
add r7, r0, #0
|
||||
add r0, r4, #0
|
||||
bl sub_02074444
|
||||
bl Boxmon_GetIconPalette
|
||||
ldr r1, [sp]
|
||||
add r3, r0, #0
|
||||
ldr r0, [r5, #0x34]
|
||||
|
||||
@ -23161,7 +23161,7 @@ ov18_021F148C: ; 0x021F148C
|
||||
add r0, r1, #0
|
||||
mov r1, #0
|
||||
add r4, r3, #0
|
||||
bl sub_02074274
|
||||
bl GetBattleMonIconNaixEx
|
||||
add r1, r0, #0
|
||||
mov r0, #0x25
|
||||
str r0, [sp]
|
||||
@ -23224,7 +23224,7 @@ ov18_021F14FC: ; 0x021F14FC
|
||||
add r0, r4, #0
|
||||
add r1, r6, #0
|
||||
mov r2, #0
|
||||
bl sub_0207440C
|
||||
bl GetBattleMonIconPaletteEx
|
||||
ldr r1, [sp, #4]
|
||||
add r3, r0, #0
|
||||
ldr r1, [r1, #0x14]
|
||||
@ -23266,7 +23266,7 @@ ov18_021F1534: ; 0x021F1534
|
||||
ldr r1, [sp, #4]
|
||||
add r0, r7, #0
|
||||
mov r2, #0
|
||||
bl sub_0207440C
|
||||
bl GetBattleMonIconPaletteEx
|
||||
add r1, r0, #0
|
||||
lsl r0, r4, #2
|
||||
add r2, r5, r0
|
||||
|
||||
@ -1939,7 +1939,7 @@ _0225AEFA:
|
||||
str r0, [sp, #0x20]
|
||||
ldr r0, [sp, #0x14]
|
||||
ldr r0, [r0, #0x10]
|
||||
bl sub_020741B0
|
||||
bl Pokemon_GetIconNaix
|
||||
add r2, r0, #0
|
||||
b _0225AF22
|
||||
_0225AF20:
|
||||
@ -2364,7 +2364,7 @@ _0225B298:
|
||||
lsl r3, r3, #0x14
|
||||
bl sub_0200DDC4
|
||||
ldr r0, [r4, #0x10]
|
||||
bl sub_02074484
|
||||
bl Pokemon_GetIconPalette
|
||||
add r1, r0, #0
|
||||
mov r0, #0xea
|
||||
lsl r0, r0, #2
|
||||
|
||||
@ -363,14 +363,14 @@ _021E5C00: .word 56150
|
||||
|
||||
.rodata
|
||||
|
||||
.public ov36_021E5C04
|
||||
ov36_021E5C04:
|
||||
.public ov36_App_MainMenu_SelectOption_Continue
|
||||
ov36_App_MainMenu_SelectOption_Continue:
|
||||
.word ov36_021E599C, ov36_021E59B4, ov36_021E5A1C, 0xFFFFFFFF
|
||||
.public ov36_021E5C14
|
||||
ov36_021E5C14:
|
||||
.word ov36_021E5948, ov36_021E5960, ov36_021E5980, 0xFFFFFFFF
|
||||
.public ov36_021E5C24
|
||||
ov36_021E5C24:
|
||||
.public ov36_App_MainMenu_SelectOption_NewGame
|
||||
ov36_App_MainMenu_SelectOption_NewGame:
|
||||
.word ov36_021E5900, ov36_021E5918, ov36_TitleScreen_SwitchToNewGame, 0xFFFFFFFF
|
||||
ov36_021E5C34:
|
||||
.byte 0x02, 0x04, 0x07, 0x08, 0x52, 0x00, 0x18, 0x00, 0x03, 0x01, 0x0A, 0xFF, 0x07, 0x00, 0x00, 0x00
|
||||
|
||||
@ -44,7 +44,7 @@ ov40_0222B6E0: ; 0x0222B6E0
|
||||
mov r0, #0x6d
|
||||
mov r2, #1
|
||||
add r3, r1, #0
|
||||
bl sub_02026EB4
|
||||
bl GF_3DVramMan_Create
|
||||
str r0, [r4, #0x60]
|
||||
mov r0, #0x6d
|
||||
bl sub_02007FD4
|
||||
@ -373,7 +373,7 @@ _0222BA4A:
|
||||
ldr r0, [r5, #0x4c]
|
||||
bl DestroyMsgData
|
||||
ldr r0, [r5, #0x60]
|
||||
bl sub_02026F54
|
||||
bl GF_3DVramMan_Delete
|
||||
ldr r0, [r5, #0x64]
|
||||
bl sub_02008524
|
||||
add r0, r5, #0
|
||||
@ -5753,7 +5753,7 @@ ov40_0222E510: ; 0x0222E510
|
||||
ldr r1, [sp, #0x24]
|
||||
ldr r2, [sp, #0x20]
|
||||
add r0, r7, #0
|
||||
bl sub_020741BC
|
||||
bl GetMonIconNaixEx
|
||||
add r3, r0, #0
|
||||
mov r0, #0
|
||||
str r0, [sp]
|
||||
@ -5797,7 +5797,7 @@ ov40_0222E510: ; 0x0222E510
|
||||
ldr r1, [sp, #0x20]
|
||||
ldr r2, [sp, #0x24]
|
||||
add r0, r7, #0
|
||||
bl sub_02074364
|
||||
bl GetMonIconPaletteEx
|
||||
add r2, r0, #0
|
||||
ldr r1, [sp, #0x1c]
|
||||
ldr r0, [r5, #4]
|
||||
@ -8999,7 +8999,7 @@ _0222FEB6:
|
||||
str r0, [sp, #0x14]
|
||||
ldr r1, [sp, #0x14]
|
||||
add r0, r4, #0
|
||||
bl sub_020741BC
|
||||
bl GetMonIconNaixEx
|
||||
add r3, r0, #0
|
||||
mov r0, #0
|
||||
str r0, [sp]
|
||||
@ -9043,7 +9043,7 @@ _0222FEB6:
|
||||
ldr r1, [sp, #0x10]
|
||||
ldr r2, [sp, #0x14]
|
||||
add r0, r4, #0
|
||||
bl sub_02074364
|
||||
bl GetMonIconPaletteEx
|
||||
add r1, r0, #0
|
||||
add r0, r5, #0
|
||||
add r1, r1, #4
|
||||
@ -9802,7 +9802,7 @@ _02230558:
|
||||
str r0, [sp, #0x24]
|
||||
ldr r0, [sp, #0x20]
|
||||
ldr r2, [sp, #0x24]
|
||||
bl sub_020741BC
|
||||
bl GetMonIconNaixEx
|
||||
add r3, r0, #0
|
||||
mov r0, #0
|
||||
str r0, [sp]
|
||||
@ -9859,7 +9859,7 @@ _02230558:
|
||||
ldr r0, [sp, #0x20]
|
||||
ldr r1, [sp, #0x24]
|
||||
mov r2, #0
|
||||
bl sub_02074364
|
||||
bl GetMonIconPaletteEx
|
||||
add r1, r0, #0
|
||||
ldr r0, [r5, #0xc]
|
||||
add r1, r1, #4
|
||||
@ -23356,7 +23356,7 @@ _022372F6:
|
||||
ldr r1, [sp, #0x28]
|
||||
ldr r2, [sp, #0x18]
|
||||
add r0, r6, #0
|
||||
bl sub_020741BC
|
||||
bl GetMonIconNaixEx
|
||||
add r3, r0, #0
|
||||
mov r0, #0
|
||||
str r0, [sp]
|
||||
@ -23418,7 +23418,7 @@ _022372F6:
|
||||
ldr r1, [sp, #0x18]
|
||||
ldr r2, [sp, #0x28]
|
||||
add r0, r6, #0
|
||||
bl sub_02074364
|
||||
bl GetMonIconPaletteEx
|
||||
add r1, r0, #0
|
||||
mov r0, #0xad
|
||||
lsl r0, r0, #2
|
||||
|
||||
@ -1213,11 +1213,11 @@ ov41_022466F0: ; 0x022466F0
|
||||
str r0, [r2]
|
||||
str r1, [r2, #0x40]
|
||||
mov r1, #1
|
||||
bl sub_02027000
|
||||
bl GF_3DVramMan_InitFrameTexVramManager
|
||||
mov r0, #1
|
||||
lsl r0, r0, #0xe
|
||||
mov r1, #1
|
||||
bl sub_02027008
|
||||
bl GF_3DVramMan_InitFramePlttVramManager
|
||||
pop {r3, pc}
|
||||
.balign 4, 0
|
||||
_02246764: .word 0x04000008
|
||||
|
||||
@ -1965,7 +1965,7 @@ ov48_02259750: ; 0x02259750
|
||||
add r0, r1, #0
|
||||
mov r1, #0
|
||||
add r3, r1, #0
|
||||
bl sub_02026EB4
|
||||
bl GF_3DVramMan_Create
|
||||
mov r1, #5
|
||||
lsl r1, r1, #6
|
||||
str r0, [r4, r1]
|
||||
@ -1985,11 +1985,11 @@ _02259784: .word 0xFFFFF001
|
||||
ov48_02259788: ; 0x02259788
|
||||
mov r1, #5
|
||||
lsl r1, r1, #6
|
||||
ldr r3, _02259794 ; =sub_02026F54
|
||||
ldr r3, _02259794 ; =GF_3DVramMan_Delete
|
||||
ldr r0, [r0, r1]
|
||||
bx r3
|
||||
nop
|
||||
_02259794: .word sub_02026F54
|
||||
_02259794: .word GF_3DVramMan_Delete
|
||||
thumb_func_end ov48_02259788
|
||||
|
||||
thumb_func_start ov48_02259798
|
||||
|
||||
@ -4380,7 +4380,7 @@ _0225A742:
|
||||
add r0, r6, #0
|
||||
mov r2, #2
|
||||
add r3, r1, #0
|
||||
bl sub_02026EB4
|
||||
bl GF_3DVramMan_Create
|
||||
mov r1, #0x51
|
||||
lsl r1, r1, #2
|
||||
str r0, [r5, r1]
|
||||
@ -4454,7 +4454,7 @@ _0225A80E:
|
||||
mov r0, #0x51
|
||||
lsl r0, r0, #2
|
||||
ldr r0, [r6, r0]
|
||||
bl sub_02026F54
|
||||
bl GF_3DVramMan_Delete
|
||||
pop {r3, r4, r5, r6, r7, pc}
|
||||
nop
|
||||
_0225A83C: .word ov49_02269734
|
||||
|
||||
@ -402,7 +402,7 @@ ov57_02237B20: ; 0x02237B20
|
||||
mov r0, #0x96
|
||||
lsl r0, r0, #2
|
||||
ldr r0, [r4, r0]
|
||||
bl sub_02026F54
|
||||
bl GF_3DVramMan_Delete
|
||||
mov r0, #0x34
|
||||
bl ov57_02237CDC
|
||||
ldr r0, _02237C98 ; =0x0000045C
|
||||
@ -2364,7 +2364,7 @@ ov57_02238B28: ; 0x02238B28
|
||||
str r0, [sp, #4]
|
||||
mov r0, #0x34
|
||||
add r3, r1, #0
|
||||
bl sub_02026EB4
|
||||
bl GF_3DVramMan_Create
|
||||
add sp, #8
|
||||
pop {r3, pc}
|
||||
nop
|
||||
@ -2772,7 +2772,7 @@ _02238E5C:
|
||||
add r0, r1, r0
|
||||
ldr r7, [r0, #4]
|
||||
add r0, r7, #0
|
||||
bl sub_020741B0
|
||||
bl Pokemon_GetIconNaix
|
||||
add r3, r0, #0
|
||||
mov r0, #0
|
||||
str r0, [sp]
|
||||
@ -2847,7 +2847,7 @@ _02238E5C:
|
||||
add r1, r0, #0
|
||||
ldr r0, [sp, #0x10]
|
||||
ldr r2, [sp, #0x14]
|
||||
bl sub_02074364
|
||||
bl GetMonIconPaletteEx
|
||||
add r1, r0, #0
|
||||
mov r0, #0xc9
|
||||
lsl r0, r0, #2
|
||||
@ -7295,11 +7295,11 @@ ov57_0223B308: ; 0x0223B308
|
||||
ldr r0, _0223B328 ; =0x0000040C
|
||||
ldr r0, [r4, r0]
|
||||
cmp r0, #0
|
||||
bne _0223B320
|
||||
bne gApp_MainMenu_SelectOption_ConnectToRanger
|
||||
add r0, r4, #0
|
||||
bl ov57_0223B3F8
|
||||
pop {r4, pc}
|
||||
_0223B320:
|
||||
gApp_MainMenu_SelectOption_ConnectToRanger:
|
||||
add r0, r4, #0
|
||||
bl ov57_0223B45C
|
||||
pop {r4, pc}
|
||||
|
||||
@ -8972,7 +8972,7 @@ ov59_0223C298: ; 0x0223C298
|
||||
str r0, [sp, #4]
|
||||
add r0, r5, #0
|
||||
add r3, r1, #0
|
||||
bl sub_02026EB4
|
||||
bl GF_3DVramMan_Create
|
||||
str r0, [r4, #4]
|
||||
bl ov59_0223C474
|
||||
add r0, r4, #0
|
||||
@ -9044,7 +9044,7 @@ ov59_0223C350: ; 0x0223C350
|
||||
add r0, r4, #0
|
||||
bl ov59_0223C5B0
|
||||
ldr r0, [r4, #4]
|
||||
bl sub_02026F54
|
||||
bl GF_3DVramMan_Delete
|
||||
add r0, r4, #0
|
||||
bl FreeToHeap
|
||||
pop {r4, pc}
|
||||
|
||||
@ -581,7 +581,7 @@ ov60_021E5D9C: ; 0x021E5D9C
|
||||
ldr r0, [r4]
|
||||
mov r2, #1
|
||||
add r3, r1, #0
|
||||
bl sub_02026EB4
|
||||
bl GF_3DVramMan_Create
|
||||
str r0, [r4, #8]
|
||||
ldr r1, _021E5DC8 ; =0x04000008
|
||||
mov r0, #3
|
||||
@ -598,11 +598,11 @@ _021E5DC8: .word 0x04000008
|
||||
|
||||
thumb_func_start ov60_021E5DCC
|
||||
ov60_021E5DCC: ; 0x021E5DCC
|
||||
ldr r3, _021E5DD4 ; =sub_02026F54
|
||||
ldr r3, _021E5DD4 ; =GF_3DVramMan_Delete
|
||||
ldr r0, [r0, #8]
|
||||
bx r3
|
||||
nop
|
||||
_021E5DD4: .word sub_02026F54
|
||||
_021E5DD4: .word GF_3DVramMan_Delete
|
||||
thumb_func_end ov60_021E5DCC
|
||||
|
||||
thumb_func_start ov60_021E5DD8
|
||||
@ -6512,7 +6512,7 @@ ov60_021E8C68: ; 0x021E8C68
|
||||
mov r0, #0x4a
|
||||
mov r2, #1
|
||||
add r3, r1, #0
|
||||
bl sub_02026EB4
|
||||
bl GF_3DVramMan_Create
|
||||
mov r1, #0x6f
|
||||
lsl r1, r1, #2
|
||||
str r0, [r4, r1]
|
||||
@ -7492,7 +7492,7 @@ _021E94D8:
|
||||
mov r0, #0x6f
|
||||
lsl r0, r0, #2
|
||||
ldr r0, [r7, r0]
|
||||
bl sub_02026F54
|
||||
bl GF_3DVramMan_Delete
|
||||
mov r4, #0
|
||||
_021E9520:
|
||||
lsl r0, r4, #2
|
||||
@ -8551,7 +8551,7 @@ ov60_021E9D78: ; 0x021E9D78
|
||||
mov r0, #0x4a
|
||||
mov r2, #1
|
||||
add r3, r1, #0
|
||||
bl sub_02026EB4
|
||||
bl GF_3DVramMan_Create
|
||||
str r0, [r4, #0x5c]
|
||||
bl sub_02014DA0
|
||||
mov r1, #0x12
|
||||
@ -9052,7 +9052,7 @@ ov60_021EA21C: ; 0x021EA21C
|
||||
ldr r0, [r5, #0x60]
|
||||
bl FreeToHeap
|
||||
ldr r0, [r5, #0x5c]
|
||||
bl sub_02026F54
|
||||
bl GF_3DVramMan_Delete
|
||||
add r0, r6, #0
|
||||
add r1, r5, #0
|
||||
bl ov60_021EA6AC
|
||||
|
||||
@ -843,7 +843,7 @@ ChooseStarterApplication_OvyExit: ; 0x021E5F74
|
||||
ldr r0, [r4, #8]
|
||||
bl FreeToHeap
|
||||
ldr r0, [r4, #0xc]
|
||||
bl sub_02026F54
|
||||
bl GF_3DVramMan_Delete
|
||||
add r0, r5, #0
|
||||
bl OverlayManager_FreeData
|
||||
mov r0, #0x2e
|
||||
@ -974,7 +974,7 @@ ov61_021E6140: ; 0x021E6140
|
||||
ldr r0, [r4, #4]
|
||||
mov r2, #2
|
||||
add r3, r1, #0
|
||||
bl sub_02026EB4
|
||||
bl GF_3DVramMan_Create
|
||||
str r0, [r4, #0xc]
|
||||
ldr r0, _021E61DC ; =0x04000060
|
||||
ldr r2, _021E61E0 ; =0xFFFFCFFF
|
||||
|
||||
@ -6173,11 +6173,11 @@ ov63_0221F088: ; 0x0221F088
|
||||
str r0, [r1, #0x40]
|
||||
mov r0, #1
|
||||
add r1, r0, #0
|
||||
bl sub_02027000
|
||||
bl GF_3DVramMan_InitFrameTexVramManager
|
||||
mov r0, #1
|
||||
lsl r0, r0, #0xe
|
||||
mov r1, #1
|
||||
bl sub_02027008
|
||||
bl GF_3DVramMan_InitFramePlttVramManager
|
||||
mov r0, #1
|
||||
add r1, r0, #0
|
||||
bl GX_EngineAToggleLayers
|
||||
|
||||
@ -186,7 +186,7 @@ ov65_0221BFBC: ; 0x0221BFBC
|
||||
add r0, r5, #0
|
||||
add r1, r4, #0
|
||||
add r2, r6, #0
|
||||
bl sub_02074364
|
||||
bl GetMonIconPaletteEx
|
||||
add r1, r0, #0
|
||||
ldr r0, [sp, #0x14]
|
||||
add r1, #0xa
|
||||
@ -754,7 +754,7 @@ _0221C48A:
|
||||
ldr r1, _0221C5D0 ; =0x000006A1
|
||||
ldrh r0, [r4, r0]
|
||||
ldrb r1, [r4, r1]
|
||||
bl sub_020741BC
|
||||
bl GetMonIconNaixEx
|
||||
add r1, r0, #0
|
||||
mov r0, #0x1a
|
||||
str r0, [sp]
|
||||
|
||||
@ -12933,7 +12933,7 @@ ov70_0223E0BC: ; 0x0223E0BC
|
||||
str r0, [sp]
|
||||
add r7, r3, #0
|
||||
ldr r4, [sp, #0x28]
|
||||
bl sub_020741BC
|
||||
bl GetMonIconNaixEx
|
||||
add r1, r0, #0
|
||||
ldr r0, [sp, #0x24]
|
||||
add r2, sp, #8
|
||||
@ -12956,7 +12956,7 @@ ov70_0223E0BC: ; 0x0223E0BC
|
||||
str r0, [r4, #8]
|
||||
ldr r0, [sp]
|
||||
add r2, r6, #0
|
||||
bl sub_02074364
|
||||
bl GetMonIconPaletteEx
|
||||
add r0, r0, #3
|
||||
str r0, [r4, #4]
|
||||
ldr r0, [sp, #4]
|
||||
|
||||
@ -2840,11 +2840,11 @@ ov71_02247ED0: ; 0x02247ED0
|
||||
str r0, [r1, #0x40]
|
||||
mov r0, #1
|
||||
add r1, r0, #0
|
||||
bl sub_02027000
|
||||
bl GF_3DVramMan_InitFrameTexVramManager
|
||||
mov r0, #1
|
||||
lsl r0, r0, #0xe
|
||||
mov r1, #1
|
||||
bl sub_02027008
|
||||
bl GF_3DVramMan_InitFramePlttVramManager
|
||||
ldr r3, _02247F8C ; =NNS_GfdDefaultFuncAllocTexVram
|
||||
mov r0, #1
|
||||
mov r1, #0
|
||||
@ -4122,11 +4122,11 @@ ov71_022488E4: ; 0x022488E4
|
||||
str r0, [r1, #0x40]
|
||||
mov r0, #1
|
||||
add r1, r0, #0
|
||||
bl sub_02027000
|
||||
bl GF_3DVramMan_InitFrameTexVramManager
|
||||
mov r0, #1
|
||||
lsl r0, r0, #0xe
|
||||
mov r1, #1
|
||||
bl sub_02027008
|
||||
bl GF_3DVramMan_InitFramePlttVramManager
|
||||
mov r0, #1
|
||||
add r1, r0, #0
|
||||
bl GX_EngineAToggleLayers
|
||||
@ -6037,11 +6037,11 @@ ov71_022497E0: ; 0x022497E0
|
||||
str r0, [r1, #0x40]
|
||||
mov r0, #1
|
||||
add r1, r0, #0
|
||||
bl sub_02027000
|
||||
bl GF_3DVramMan_InitFrameTexVramManager
|
||||
mov r0, #1
|
||||
lsl r0, r0, #0xe
|
||||
mov r1, #1
|
||||
bl sub_02027008
|
||||
bl GF_3DVramMan_InitFramePlttVramManager
|
||||
mov r0, #1
|
||||
add r1, r0, #0
|
||||
bl GX_EngineAToggleLayers
|
||||
@ -7548,11 +7548,11 @@ ov71_0224A3F0: ; 0x0224A3F0
|
||||
str r0, [r1, #0x40]
|
||||
mov r0, #1
|
||||
add r1, r0, #0
|
||||
bl sub_02027000
|
||||
bl GF_3DVramMan_InitFrameTexVramManager
|
||||
mov r0, #1
|
||||
lsl r0, r0, #0xe
|
||||
mov r1, #1
|
||||
bl sub_02027008
|
||||
bl GF_3DVramMan_InitFramePlttVramManager
|
||||
mov r0, #1
|
||||
add r1, r0, #0
|
||||
bl GX_EngineAToggleLayers
|
||||
@ -8799,11 +8799,11 @@ ov71_0224ADE4: ; 0x0224ADE4
|
||||
str r0, [r1, #0x40]
|
||||
mov r0, #1
|
||||
add r1, r0, #0
|
||||
bl sub_02027000
|
||||
bl GF_3DVramMan_InitFrameTexVramManager
|
||||
mov r0, #1
|
||||
lsl r0, r0, #0xe
|
||||
mov r1, #1
|
||||
bl sub_02027008
|
||||
bl GF_3DVramMan_InitFramePlttVramManager
|
||||
mov r0, #1
|
||||
add r1, r0, #0
|
||||
bl GX_EngineAToggleLayers
|
||||
@ -9931,11 +9931,11 @@ ov71_0224B720: ; 0x0224B720
|
||||
str r0, [r1, #0x40]
|
||||
mov r0, #1
|
||||
add r1, r0, #0
|
||||
bl sub_02027000
|
||||
bl GF_3DVramMan_InitFrameTexVramManager
|
||||
mov r0, #1
|
||||
lsl r0, r0, #0xe
|
||||
mov r1, #1
|
||||
bl sub_02027008
|
||||
bl GF_3DVramMan_InitFramePlttVramManager
|
||||
ldr r3, _0224B7DC ; =NNS_GfdDefaultFuncAllocTexVram
|
||||
mov r0, #1
|
||||
mov r1, #0
|
||||
|
||||
@ -2038,8 +2038,8 @@ _02228038: .word ov74_0223BBC4
|
||||
_0222803C: .word ov74_0223BCBC
|
||||
thumb_func_end ov74_MainMenu_PrintContinueButton
|
||||
|
||||
thumb_func_start ov74_02228040
|
||||
ov74_02228040: ; 0x02228040
|
||||
thumb_func_start ov74_MainMenu_PrintMigrateFromAgbButton
|
||||
ov74_MainMenu_PrintMigrateFromAgbButton: ; 0x02228040
|
||||
push {r3, r4, r5, r6, lr}
|
||||
sub sp, #4
|
||||
add r4, r0, #0
|
||||
@ -2069,19 +2069,19 @@ _0222806A: ; jump table
|
||||
.short _02228080 - _0222806A - 2 ; case 3
|
||||
.short _02228084 - _0222806A - 2 ; case 4
|
||||
_02228074:
|
||||
mov r0, #4
|
||||
mov r0, #msg_0442_00004
|
||||
b _02228086
|
||||
_02228078:
|
||||
mov r0, #5
|
||||
mov r0, #msg_0442_00005
|
||||
b _02228086
|
||||
_0222807C:
|
||||
mov r0, #6
|
||||
mov r0, #msg_0442_00006
|
||||
b _02228086
|
||||
_02228080:
|
||||
mov r0, #7
|
||||
mov r0, #msg_0442_00007
|
||||
b _02228086
|
||||
_02228084:
|
||||
mov r0, #8
|
||||
mov r0, #msg_0442_00008
|
||||
_02228086:
|
||||
str r0, [sp]
|
||||
ldr r0, [r4]
|
||||
@ -2104,10 +2104,10 @@ _02228086:
|
||||
pop {r3, r4, r5, r6, pc}
|
||||
.balign 4, 0
|
||||
_022280B0: .word ov74_0223BCBC
|
||||
thumb_func_end ov74_02228040
|
||||
thumb_func_end ov74_MainMenu_PrintMigrateFromAgbButton
|
||||
|
||||
thumb_func_start ov74_022280B4
|
||||
ov74_022280B4: ; 0x022280B4
|
||||
thumb_func_start ov74_MainMenu_PrintMysteryGiftButton
|
||||
ov74_MainMenu_PrintMysteryGiftButton: ; 0x022280B4
|
||||
push {r3, r4, r5, r6, r7, lr}
|
||||
sub sp, #8
|
||||
add r5, r0, #0
|
||||
@ -2188,10 +2188,10 @@ _02228150:
|
||||
nop
|
||||
_02228158: .word ov74_0223BCBC + 8
|
||||
_0222815C: .word ov74_0223BCBC
|
||||
thumb_func_end ov74_022280B4
|
||||
thumb_func_end ov74_MainMenu_PrintMysteryGiftButton
|
||||
|
||||
thumb_func_start ov74_02228160
|
||||
ov74_02228160: ; 0x02228160
|
||||
thumb_func_start ov74_MainMenu_PrintConnectToRangerButton
|
||||
ov74_MainMenu_PrintConnectToRangerButton: ; 0x02228160
|
||||
push {r3, r4, r5, r6, r7, lr}
|
||||
add r5, r0, #0
|
||||
ldr r0, [r5, #0x2c]
|
||||
@ -2236,10 +2236,10 @@ _022281B0:
|
||||
.balign 4, 0
|
||||
_022281B4: .word ov74_0223BCBC + 8
|
||||
_022281B8: .word ov74_0223BCBC
|
||||
thumb_func_end ov74_02228160
|
||||
thumb_func_end ov74_MainMenu_PrintConnectToRangerButton
|
||||
|
||||
thumb_func_start ov74_022281BC
|
||||
ov74_022281BC: ; 0x022281BC
|
||||
thumb_func_start ov74_MainMenu_PrintConnectToWiiButton
|
||||
ov74_MainMenu_PrintConnectToWiiButton: ; 0x022281BC
|
||||
push {r3, r4, r5, r6, r7, lr}
|
||||
add r4, r0, #0
|
||||
ldr r0, [r4, #0x30]
|
||||
@ -2278,10 +2278,10 @@ _02228200:
|
||||
.balign 4, 0
|
||||
_02228204: .word ov74_0223BCBC + 8
|
||||
_02228208: .word ov74_0223BCBC
|
||||
thumb_func_end ov74_022281BC
|
||||
thumb_func_end ov74_MainMenu_PrintConnectToWiiButton
|
||||
|
||||
thumb_func_start ov74_0222820C
|
||||
ov74_0222820C: ; 0x0222820C
|
||||
thumb_func_start ov74_MainMenu_PrintNintendoWFCSetupButton
|
||||
ov74_MainMenu_PrintNintendoWFCSetupButton: ; 0x0222820C
|
||||
push {r3, r4, r5, r6, r7, lr}
|
||||
add r4, r1, #0
|
||||
add r5, r0, #0
|
||||
@ -2314,10 +2314,10 @@ ov74_0222820C: ; 0x0222820C
|
||||
nop
|
||||
_0222824C: .word ov74_0223BCBC + 8
|
||||
_02228250: .word ov74_0223BCBC
|
||||
thumb_func_end ov74_0222820C
|
||||
thumb_func_end ov74_MainMenu_PrintNintendoWFCSetupButton
|
||||
|
||||
thumb_func_start ov74_02228254
|
||||
ov74_02228254: ; 0x02228254
|
||||
thumb_func_start ov74_MainMenu_PrintConnectToPokewalkerButton
|
||||
ov74_MainMenu_PrintConnectToPokewalkerButton: ; 0x02228254
|
||||
push {r3, r4, r5, r6, r7, lr}
|
||||
add r6, r1, #0
|
||||
add r5, r0, #0
|
||||
@ -2345,10 +2345,10 @@ ov74_02228254: ; 0x02228254
|
||||
.balign 4, 0
|
||||
_02228288: .word ov74_0223BCBC + 8
|
||||
_0222828C: .word ov74_0223BCBC
|
||||
thumb_func_end ov74_02228254
|
||||
thumb_func_end ov74_MainMenu_PrintConnectToPokewalkerButton
|
||||
|
||||
thumb_func_start ov74_02228290
|
||||
ov74_02228290: ; 0x02228290
|
||||
thumb_func_start ov74_MainMenu_PrintWiiMessageSettingsButton
|
||||
ov74_MainMenu_PrintWiiMessageSettingsButton: ; 0x02228290
|
||||
push {r3, r4, r5, r6, r7, lr}
|
||||
add r6, r1, #0
|
||||
add r5, r0, #0
|
||||
@ -2376,7 +2376,7 @@ ov74_02228290: ; 0x02228290
|
||||
.balign 4, 0
|
||||
_022282C4: .word ov74_0223BCBC + 8
|
||||
_022282C8: .word ov74_0223BCBC
|
||||
thumb_func_end ov74_02228290
|
||||
thumb_func_end ov74_MainMenu_PrintWiiMessageSettingsButton
|
||||
|
||||
thumb_func_start ov74_022282CC
|
||||
ov74_022282CC: ; 0x022282CC
|
||||
@ -3163,8 +3163,8 @@ _02228918: .word 0x027E0000
|
||||
_0222891C: .word 0x00003FF8
|
||||
thumb_func_end ov74_022288F8
|
||||
|
||||
thumb_func_start ov74_02228920
|
||||
ov74_02228920: ; 0x02228920
|
||||
thumb_func_start ov74_MainMenu_AppInit
|
||||
ov74_MainMenu_AppInit: ; 0x02228920
|
||||
push {r3, r4, r5, lr}
|
||||
mov r2, #1
|
||||
add r5, r0, #0
|
||||
@ -3239,10 +3239,10 @@ _022289C4:
|
||||
bl sub_02004AD8
|
||||
mov r0, #1
|
||||
pop {r3, r4, r5, pc}
|
||||
thumb_func_end ov74_02228920
|
||||
thumb_func_end ov74_MainMenu_AppInit
|
||||
|
||||
thumb_func_start ov74_022289D4
|
||||
ov74_022289D4: ; 0x022289D4
|
||||
thumb_func_start ov74_MainMenu_AppExec
|
||||
ov74_MainMenu_AppExec: ; 0x022289D4
|
||||
push {r4, r5, r6, lr}
|
||||
add r6, r0, #0
|
||||
add r5, r1, #0
|
||||
@ -3454,17 +3454,17 @@ _02228B70:
|
||||
.balign 4, 0
|
||||
_02228B84: .word 0x00007D8C
|
||||
_02228B88: .word ov74_022288F8
|
||||
thumb_func_end ov74_022289D4
|
||||
thumb_func_end ov74_MainMenu_AppExec
|
||||
|
||||
.public ov36_021E5C04
|
||||
.public ov36_021E5C24
|
||||
.public _021065C4
|
||||
.public ov112_021F5728
|
||||
.public _021065C4
|
||||
.public ov75_02249964
|
||||
.public ov36_App_MainMenu_SelectOption_Continue
|
||||
.public ov36_App_MainMenu_SelectOption_NewGame
|
||||
.public gApp_MainMenu_SelectOption_NintendoWFCSetup
|
||||
.public ov112_App_MainMenu_SelectOption_ConnectToPokewalker
|
||||
.public gApp_MainMenu_SelectOption_NintendoWFCSetup
|
||||
.public ov75_App_MainMenu_SelectOption_WiiMessageSettings
|
||||
|
||||
thumb_func_start ov74_02228B8C
|
||||
ov74_02228B8C: ; 0x02228B8C
|
||||
thumb_func_start ov74_MainMenu_QueueSelectedApp
|
||||
ov74_MainMenu_QueueSelectedApp: ; 0x02228B8C
|
||||
push {r3, lr}
|
||||
ldr r0, [r0, #0x58]
|
||||
cmp r0, #9
|
||||
@ -3488,50 +3488,50 @@ _02228BA0: ; jump table
|
||||
.short _02228C0C - _02228BA0 - 2 ; case 9
|
||||
_02228BB4:
|
||||
ldr r0, _02228C24 ; =SDK_OVERLAY_OVY_36_ID
|
||||
ldr r1, _02228C28 ; =ov36_021E5C04
|
||||
ldr r1, _02228C28 ; =ov36_App_MainMenu_SelectOption_Continue
|
||||
bl RegisterMainOverlay
|
||||
pop {r3, pc}
|
||||
_02228BBE:
|
||||
ldr r0, _02228C24 ; =SDK_OVERLAY_OVY_36_ID
|
||||
ldr r1, _02228C2C ; =ov36_021E5C24
|
||||
ldr r1, _02228C2C ; =ov36_App_MainMenu_SelectOption_NewGame
|
||||
bl RegisterMainOverlay
|
||||
pop {r3, pc}
|
||||
_02228BC8:
|
||||
ldr r0, _02228C30 ; =SDK_OVERLAY_OVY_74_ID
|
||||
ldr r1, _02228C34 ; =_0223B380
|
||||
ldr r1, _02228C34 ; =gApp_MainMenu_SelectOption_MysteryGift
|
||||
bl RegisterMainOverlay
|
||||
pop {r3, pc}
|
||||
_02228BD2:
|
||||
ldr r0, _02228C30 ; =SDK_OVERLAY_OVY_74_ID
|
||||
ldr r1, _02228C38 ; =_0223B4D8
|
||||
ldr r1, _02228C38 ; =gApp_MainMenu_SelectOption_MigrateFromAgb
|
||||
bl RegisterMainOverlay
|
||||
pop {r3, pc}
|
||||
_02228BDC:
|
||||
ldr r0, _02228C30 ; =SDK_OVERLAY_OVY_74_ID
|
||||
ldr r1, _02228C3C ; =_0223B320
|
||||
ldr r1, _02228C3C ; =gApp_MainMenu_SelectOption_ConnectToRanger
|
||||
bl RegisterMainOverlay
|
||||
pop {r3, pc}
|
||||
_02228BE6:
|
||||
ldr r0, _02228C40 ; =ov74_0223BD4C
|
||||
ldr r0, _02228C40 ; =ov74_0223BD4C ; "data/eoo.dat"
|
||||
bl sub_02027098
|
||||
pop {r3, pc}
|
||||
_02228BEE:
|
||||
bl sub_02005FA0
|
||||
mov r0, #0
|
||||
ldr r1, _02228C44 ; =_021065C4
|
||||
ldr r1, _02228C44 ; =gApp_MainMenu_SelectOption_NintendoWFCSetup
|
||||
mvn r0, r0
|
||||
bl RegisterMainOverlay
|
||||
pop {r3, pc}
|
||||
_02228BFE:
|
||||
bl sub_02005FA0
|
||||
ldr r0, _02228C48 ; =SDK_OVERLAY_OVY_112_ID
|
||||
ldr r1, _02228C4C ; =ov112_021F5728
|
||||
ldr r1, _02228C4C ; =ov112_App_MainMenu_SelectOption_ConnectToPokewalker
|
||||
bl RegisterMainOverlay
|
||||
pop {r3, pc}
|
||||
_02228C0C:
|
||||
bl sub_02005FA0
|
||||
ldr r0, _02228C50 ; =SDK_OVERLAY_OVY_75_ID
|
||||
ldr r1, _02228C54 ; =ov75_02249964
|
||||
ldr r1, _02228C54 ; =ov75_App_MainMenu_SelectOption_WiiMessageSettings
|
||||
bl RegisterMainOverlay
|
||||
pop {r3, pc}
|
||||
_02228C1A:
|
||||
@ -3542,28 +3542,28 @@ _02228C22:
|
||||
pop {r3, pc}
|
||||
.balign 4, 0
|
||||
_02228C24: .word SDK_OVERLAY_OVY_36_ID
|
||||
_02228C28: .word ov36_021E5C04
|
||||
_02228C2C: .word ov36_021E5C24
|
||||
_02228C28: .word ov36_App_MainMenu_SelectOption_Continue
|
||||
_02228C2C: .word ov36_App_MainMenu_SelectOption_NewGame
|
||||
_02228C30: .word SDK_OVERLAY_OVY_74_ID
|
||||
_02228C34: .word _0223B380
|
||||
_02228C38: .word _0223B4D8
|
||||
_02228C3C: .word _0223B320
|
||||
_02228C34: .word gApp_MainMenu_SelectOption_MysteryGift
|
||||
_02228C38: .word gApp_MainMenu_SelectOption_MigrateFromAgb
|
||||
_02228C3C: .word gApp_MainMenu_SelectOption_ConnectToRanger
|
||||
_02228C40: .word ov74_0223BD4C
|
||||
_02228C44: .word _021065C4
|
||||
_02228C44: .word gApp_MainMenu_SelectOption_NintendoWFCSetup
|
||||
_02228C48: .word SDK_OVERLAY_OVY_112_ID
|
||||
_02228C4C: .word ov112_021F5728
|
||||
_02228C4C: .word ov112_App_MainMenu_SelectOption_ConnectToPokewalker
|
||||
_02228C50: .word SDK_OVERLAY_OVY_75_ID
|
||||
_02228C54: .word ov75_02249964
|
||||
_02228C54: .word ov75_App_MainMenu_SelectOption_WiiMessageSettings
|
||||
_02228C58: .word SDK_OVERLAY_OVY_60_ID
|
||||
_02228C5C: .word ov60_021EAFE0
|
||||
thumb_func_end ov74_02228B8C
|
||||
thumb_func_end ov74_MainMenu_QueueSelectedApp
|
||||
|
||||
thumb_func_start ov74_02228C60
|
||||
ov74_02228C60: ; 0x02228C60
|
||||
thumb_func_start ov74_MainMenu_AppExit
|
||||
ov74_MainMenu_AppExit: ; 0x02228C60
|
||||
push {r4, lr}
|
||||
add r4, r0, #0
|
||||
bl OverlayManager_GetData
|
||||
bl ov74_02228B8C
|
||||
bl ov74_MainMenu_QueueSelectedApp
|
||||
add r0, r4, #0
|
||||
bl OverlayManager_FreeData
|
||||
mov r0, #0x4f
|
||||
@ -3573,7 +3573,7 @@ ov74_02228C60: ; 0x02228C60
|
||||
mov r0, #1
|
||||
pop {r4, pc}
|
||||
.balign 4, 0
|
||||
thumb_func_end ov74_02228C60
|
||||
thumb_func_end ov74_MainMenu_AppExit
|
||||
|
||||
thumb_func_start ov74_02228C84
|
||||
ov74_02228C84: ; 0x02228C84
|
||||
@ -3659,7 +3659,7 @@ ov74_02228D20: ; 0x02228D20
|
||||
add r7, r0, #0
|
||||
ldr r0, [r7, #0x10]
|
||||
bl PlayerProfile_GetNamePtr
|
||||
ldr r5, _02228D58 ; =_0223D080
|
||||
ldr r5, _02228D58 ; =ov74_0223D080
|
||||
add r4, r0, #0
|
||||
mov r6, #0
|
||||
_02228D30:
|
||||
@ -3676,14 +3676,14 @@ _02228D30:
|
||||
add r1, r0, #0
|
||||
ldr r0, _02228D5C ; =ov74_0223D090
|
||||
bl ov74_IntToWstring5
|
||||
ldr r0, _02228D60 ; =_0223D080
|
||||
ldr r0, _02228D60 ; =ov74_0223D080
|
||||
mov r1, #0
|
||||
strh r1, [r0, #0x1a]
|
||||
pop {r3, r4, r5, r6, r7, pc}
|
||||
.balign 4, 0
|
||||
_02228D58: .word _0223D080
|
||||
_02228D58: .word ov74_0223D080
|
||||
_02228D5C: .word ov74_0223D090
|
||||
_02228D60: .word _0223D080
|
||||
_02228D60: .word ov74_0223D080
|
||||
thumb_func_end ov74_02228D20
|
||||
|
||||
thumb_func_start ov74_02228D64
|
||||
@ -13649,7 +13649,7 @@ _0222DD6A:
|
||||
mov r1, #0
|
||||
ldr r0, [sp, #8]
|
||||
add r2, r1, #0
|
||||
bl sub_020741BC
|
||||
bl GetMonIconNaixEx
|
||||
add r1, r0, #0
|
||||
ldr r0, [r6]
|
||||
mov r2, #0
|
||||
@ -13672,7 +13672,7 @@ _0222DD6A:
|
||||
mov r1, #0
|
||||
ldr r0, [sp, #8]
|
||||
add r2, r1, #0
|
||||
bl sub_02074364
|
||||
bl GetMonIconPaletteEx
|
||||
add r1, r0, #0
|
||||
ldr r0, _0222DDF0 ; =0x00002DCC
|
||||
add r1, r1, #3
|
||||
@ -15381,7 +15381,7 @@ _0222EBA0:
|
||||
ldr r0, [r7, r0]
|
||||
bl FreeToHeap
|
||||
ldr r0, _0222EC00 ; =SDK_OVERLAY_OVY_74_ID
|
||||
ldr r1, _0222EC04 ; =_0223B380
|
||||
ldr r1, _0222EC04 ; =gApp_MainMenu_SelectOption_MysteryGift
|
||||
bl RegisterMainOverlay
|
||||
mov r0, #0x59
|
||||
bl DestroyHeap
|
||||
@ -15397,7 +15397,7 @@ _0222EBF4: .word 0x00002BD0
|
||||
_0222EBF8: .word 0x00002BE0
|
||||
_0222EBFC: .word 0x000029FC
|
||||
_0222EC00: .word SDK_OVERLAY_OVY_74_ID
|
||||
_0222EC04: .word _0223B380
|
||||
_0222EC04: .word gApp_MainMenu_SelectOption_MysteryGift
|
||||
thumb_func_end ov74_0222EB44
|
||||
|
||||
thumb_func_start ov74_0222EC08
|
||||
@ -16550,7 +16550,7 @@ _0222F504:
|
||||
mov r1, #0
|
||||
ldr r0, [sp, #8]
|
||||
add r2, r1, #0
|
||||
bl sub_020741BC
|
||||
bl GetMonIconNaixEx
|
||||
add r1, r0, #0
|
||||
ldr r0, [r7]
|
||||
mov r2, #0
|
||||
@ -16573,7 +16573,7 @@ _0222F504:
|
||||
mov r1, #0
|
||||
ldr r0, [sp, #8]
|
||||
add r2, r1, #0
|
||||
bl sub_02074364
|
||||
bl GetMonIconPaletteEx
|
||||
add r1, r0, #0
|
||||
ldr r0, _0222F58C ; =0x00002D84
|
||||
add r1, r1, #3
|
||||
@ -17384,7 +17384,7 @@ _0222FBE8:
|
||||
ldr r0, [r7, r0]
|
||||
bl FreeToHeap
|
||||
ldr r0, _0222FC48 ; =SDK_OVERLAY_OVY_74_ID
|
||||
ldr r1, _0222FC4C ; =_0223B380
|
||||
ldr r1, _0222FC4C ; =gApp_MainMenu_SelectOption_MysteryGift
|
||||
bl RegisterMainOverlay
|
||||
mov r0, #0x59
|
||||
bl DestroyHeap
|
||||
@ -17400,7 +17400,7 @@ _0222FC3C: .word 0x00002BC4
|
||||
_0222FC40: .word 0x00002BD4
|
||||
_0222FC44: .word 0x000029FC
|
||||
_0222FC48: .word SDK_OVERLAY_OVY_74_ID
|
||||
_0222FC4C: .word _0223B380
|
||||
_0222FC4C: .word gApp_MainMenu_SelectOption_MysteryGift
|
||||
thumb_func_end ov74_0222FB8C
|
||||
|
||||
thumb_func_start ov74_0222FC50
|
||||
@ -22117,7 +22117,7 @@ ov74_02231EC4: ; 0x02231EC4
|
||||
add r0, r4, #0
|
||||
add r1, r5, #0
|
||||
add r2, r7, #0
|
||||
bl sub_020741BC
|
||||
bl GetMonIconNaixEx
|
||||
add r1, r0, #0
|
||||
mov r0, #0x14
|
||||
add r2, sp, #0
|
||||
@ -22141,7 +22141,7 @@ ov74_02231EC4: ; 0x02231EC4
|
||||
add r0, r4, #0
|
||||
add r1, r7, #0
|
||||
add r2, r5, #0
|
||||
bl sub_02074364
|
||||
bl GetMonIconPaletteEx
|
||||
add r1, r0, #0
|
||||
ldr r0, [sp, #0x1c]
|
||||
add r1, #8
|
||||
@ -22181,7 +22181,7 @@ _02231F62:
|
||||
ldr r2, [sp]
|
||||
add r0, r6, #0
|
||||
add r1, r7, #0
|
||||
bl sub_020741BC
|
||||
bl GetMonIconNaixEx
|
||||
ldr r2, [sp, #0x24]
|
||||
ldr r3, [sp, #0x28]
|
||||
add r1, sp, #4
|
||||
@ -22202,7 +22202,7 @@ _02231F62:
|
||||
str r0, [r4, #8]
|
||||
add r0, r6, #0
|
||||
add r2, r7, #0
|
||||
bl sub_02074364
|
||||
bl GetMonIconPaletteEx
|
||||
add r0, #8
|
||||
add sp, #8
|
||||
str r0, [r4, #4]
|
||||
@ -32793,10 +32793,10 @@ _0223B2E8:
|
||||
.byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00
|
||||
|
||||
.public ov74_0223B310
|
||||
ov74_0223B310:
|
||||
.word ov74_02228920, ov74_022289D4, ov74_02228C60, 0xFFFFFFFF
|
||||
_0223B320:
|
||||
.public gApp_MainMenu
|
||||
gApp_MainMenu:
|
||||
.word ov74_MainMenu_AppInit, ov74_MainMenu_AppExec, ov74_MainMenu_AppExit, 0xFFFFFFFF
|
||||
gApp_MainMenu_SelectOption_ConnectToRanger:
|
||||
.word ov74_02229200, ov74_02229294, ov74_02229450, 0xFFFFFFFF
|
||||
_0223B330:
|
||||
.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
@ -32811,7 +32811,7 @@ _0223B368:
|
||||
.word ov74_02229DE0
|
||||
.word sub_020342C0
|
||||
.word 0
|
||||
_0223B380:
|
||||
gApp_MainMenu_SelectOption_MysteryGift:
|
||||
.word ov74_0222AE6C, ov74_0222C2EC, ov74_0222CD94, 0xFFFFFFFF
|
||||
_0223B390:
|
||||
.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
@ -32849,7 +32849,7 @@ _0223B4B0:
|
||||
.byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x02, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00
|
||||
_0223B4D8:
|
||||
gApp_MainMenu_SelectOption_MigrateFromAgb:
|
||||
.word ov74_02233230, ov74_022332F4, ov74_022338D4, 0xFFFFFFFF
|
||||
_0223B4E8:
|
||||
.byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
|
||||
@ -33132,23 +33132,25 @@ ov74_0223BC80: ; 0x0223BC80
|
||||
.byte 0x18, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00
|
||||
|
||||
ov74_0223BCBC: ; 0x0223BCBC
|
||||
.word 0x00000001, 0x0000000A, 0x00000000, ov74_MainMenu_PrintContinueButton
|
||||
.word 0x00000002, 0x00000004, 0x00000001, 0
|
||||
.word 0x00000003, 0x00000004, 0x00000009, ov74_02228254
|
||||
.word 0x00000004, 0x00000004, 0x00000002, ov74_022280B4
|
||||
.word 0x00000005, 0x00000004, 0x00000003, ov74_02228160
|
||||
.word 0x00000006, 0x00000004, 0x00000000, ov74_02228040
|
||||
.word 0x00000007, 0x00000004, 0x0000000B, ov74_022281BC
|
||||
.word 0x00000008, 0x00000004, 0x0000000C, ov74_0222820C
|
||||
.word 0x00000009, 0x00000004, 0x0000000A, ov74_02228290
|
||||
; internal code, button height, button text, print function
|
||||
.word 1, 10, msg_0442_00000, ov74_MainMenu_PrintContinueButton
|
||||
.word 2, 4, msg_0442_00001, 0 ; New Game
|
||||
.word 3, 4, msg_0442_00009, ov74_MainMenu_PrintConnectToPokewalkerButton
|
||||
.word 4, 4, msg_0442_00002, ov74_MainMenu_PrintMysteryGiftButton
|
||||
.word 5, 4, msg_0442_00003, ov74_MainMenu_PrintConnectToRangerButton
|
||||
.word 6, 4, msg_0442_00000, ov74_MainMenu_PrintMigrateFromAgbButton ; 4, 5, 6, 7, or 8 depending on crtdg
|
||||
.word 7, 4, msg_0442_00011, ov74_MainMenu_PrintConnectToWiiButton
|
||||
.word 8, 4, msg_0442_00012, ov74_MainMenu_PrintNintendoWFCSetupButton
|
||||
.word 9, 4, msg_0442_00010, ov74_MainMenu_PrintWiiMessageSettingsButton
|
||||
|
||||
ov74_0223BD4C: ; 0x0223BD4C
|
||||
.asciz "data/eoo.dat"
|
||||
.balign 4, 0
|
||||
|
||||
ov74_0223BD5C: ; 0x0223BD5C
|
||||
.byte 0x16, 0x01, 0x15, 0x00
|
||||
.byte 0x90, 0xD0, 0x23, 0x02, 0x80, 0xD0, 0x23, 0x02
|
||||
.word 0x00150116 ; bitfield
|
||||
.word ov74_0223D090
|
||||
.word ov74_0223D080
|
||||
|
||||
ov74_0223BD68: ; 0x0223BD68
|
||||
.byte 0x00, 0x00, 0xFF, 0xFF, 0x21, 0x00, 0xE1, 0x00
|
||||
@ -33670,7 +33672,7 @@ ov74_0223D054: ; 0x0223D054
|
||||
|
||||
.bss
|
||||
|
||||
_0223D080:
|
||||
ov74_0223D080:
|
||||
.space 0x10
|
||||
|
||||
ov74_0223D090: ; 0x0223D090
|
||||
|
||||
@ -6139,8 +6139,8 @@ ov75_02249904: ; 0x02249904
|
||||
.word ov75_02246E3C, ov75_02246E78, _02102620, 0
|
||||
.word ov75_02246EAC, ov75_02246EDC, ov75_022498E4, 1
|
||||
|
||||
.public ov75_02249964
|
||||
ov75_02249964:
|
||||
.public ov75_App_MainMenu_SelectOption_WiiMessageSettings
|
||||
ov75_App_MainMenu_SelectOption_WiiMessageSettings:
|
||||
.word ov75_02246960, ov75_022469D8, ov75_02246B00, 0xFFFFFFFF
|
||||
ov75_02249974:
|
||||
.byte 0x0B, 0x07, 0x14, 0x08
|
||||
|
||||
@ -11326,7 +11326,7 @@ ov80_0222F29C: ; 0x0222F29C
|
||||
bl GF_AssertFail
|
||||
_0222F2B0:
|
||||
add r0, r7, #0
|
||||
bl sub_020741B0
|
||||
bl Pokemon_GetIconNaix
|
||||
add r3, r0, #0
|
||||
mov r0, #0
|
||||
str r0, [sp]
|
||||
@ -11366,7 +11366,7 @@ _0222F2D8:
|
||||
bl sub_0200D734
|
||||
add r4, r0, #0
|
||||
add r0, r7, #0
|
||||
bl sub_02074484
|
||||
bl Pokemon_GetIconPalette
|
||||
add r1, r0, #0
|
||||
ldr r0, [r4]
|
||||
bl sub_02024AA8
|
||||
@ -31895,7 +31895,7 @@ ov80_022392DC: ; 0x022392DC
|
||||
str r1, [sp, #4]
|
||||
mov r1, #0
|
||||
add r3, r1, #0
|
||||
bl sub_02026EB4
|
||||
bl GF_3DVramMan_Create
|
||||
add sp, #8
|
||||
pop {r3, pc}
|
||||
.balign 4, 0
|
||||
@ -31966,10 +31966,10 @@ _02239378: .word 0x04000580
|
||||
|
||||
thumb_func_start ov80_0223937C
|
||||
ov80_0223937C: ; 0x0223937C
|
||||
ldr r3, _02239380 ; =sub_02026F54
|
||||
ldr r3, _02239380 ; =GF_3DVramMan_Delete
|
||||
bx r3
|
||||
.balign 4, 0
|
||||
_02239380: .word sub_02026F54
|
||||
_02239380: .word GF_3DVramMan_Delete
|
||||
thumb_func_end ov80_0223937C
|
||||
|
||||
thumb_func_start ov80_02239384
|
||||
@ -36387,7 +36387,7 @@ _0223B4B2:
|
||||
str r2, [r5, #0xc]
|
||||
str r4, [r5, #0x18]
|
||||
str r6, [r5, #0x10]
|
||||
ldr r0, _0223B4D8 ; =ov80_0223B468
|
||||
ldr r0, gApp_MainMenu_SelectOption_MigrateFromAgb ; =ov80_0223B468
|
||||
str r7, [r5, #0x14]
|
||||
add r1, r5, #0
|
||||
bl sub_0200E374
|
||||
@ -36399,7 +36399,7 @@ _0223B4B2:
|
||||
str r0, [r5]
|
||||
pop {r3, r4, r5, r6, r7, pc}
|
||||
.balign 4, 0
|
||||
_0223B4D8: .word ov80_0223B468
|
||||
gApp_MainMenu_SelectOption_MigrateFromAgb: .word ov80_0223B468
|
||||
_0223B4DC: .word ov80_0223B484
|
||||
thumb_func_end ov80_0223B4A0
|
||||
|
||||
|
||||
@ -32,7 +32,7 @@ ov81_0223DD60: ; 0x0223DD60
|
||||
str r0, [sp, #4]
|
||||
mov r0, #0x64
|
||||
add r3, r1, #0
|
||||
bl sub_02026EB4
|
||||
bl GF_3DVramMan_Create
|
||||
mov r1, #0x69
|
||||
lsl r1, r1, #2
|
||||
str r0, [r4, r1]
|
||||
@ -5793,7 +5793,7 @@ _02240C9A:
|
||||
mov r0, #0x69
|
||||
lsl r0, r0, #2
|
||||
ldr r0, [r5, r0]
|
||||
bl sub_02026F54
|
||||
bl GF_3DVramMan_Delete
|
||||
pop {r3, r4, r5, r6, r7, pc}
|
||||
.balign 4, 0
|
||||
thumb_func_end ov81_02240BB0
|
||||
@ -5811,7 +5811,7 @@ ov81_02240CD4: ; 0x02240CD4
|
||||
str r0, [sp, #4]
|
||||
mov r0, #0x64
|
||||
add r3, r1, #0
|
||||
bl sub_02026EB4
|
||||
bl GF_3DVramMan_Create
|
||||
mov r1, #0x69
|
||||
lsl r1, r1, #2
|
||||
str r0, [r4, r1]
|
||||
@ -8577,7 +8577,7 @@ ov81_02242218: ; 0x02242218
|
||||
ldr r2, [sp, #0x18]
|
||||
add r0, r7, #0
|
||||
mov r1, #0
|
||||
bl sub_020741BC
|
||||
bl GetMonIconNaixEx
|
||||
add r1, r0, #0
|
||||
mov r0, #0x64
|
||||
str r0, [sp]
|
||||
@ -8604,7 +8604,7 @@ ov81_02242218: ; 0x02242218
|
||||
ldr r1, [sp, #0x18]
|
||||
add r0, r7, #0
|
||||
mov r2, #0
|
||||
bl sub_02074364
|
||||
bl GetMonIconPaletteEx
|
||||
add r1, r0, #0
|
||||
mov r0, #0x12
|
||||
lsl r0, r0, #6
|
||||
|
||||
@ -3692,7 +3692,7 @@ _0223F996:
|
||||
bl NARC_ctor
|
||||
str r0, [sp, #0x18]
|
||||
ldr r0, [sp, #0x14]
|
||||
bl sub_020741B0
|
||||
bl Pokemon_GetIconNaix
|
||||
add r2, r0, #0
|
||||
mov r0, #1
|
||||
str r0, [sp]
|
||||
@ -4065,7 +4065,7 @@ ov82_0223FD18: ; 0x0223FD18
|
||||
push {r4, lr}
|
||||
add r4, r0, #0
|
||||
add r0, r1, #0
|
||||
bl sub_02074484
|
||||
bl Pokemon_GetIconPalette
|
||||
add r1, r0, #0
|
||||
ldr r0, [r4, #0x10]
|
||||
bl sub_02024AA8
|
||||
|
||||
@ -17889,7 +17889,7 @@ _022470CC:
|
||||
add r1, r4, #0
|
||||
bl GetPartyMonByIndex
|
||||
_022470D4:
|
||||
bl sub_020741B0
|
||||
bl Pokemon_GetIconNaix
|
||||
add r2, r0, #0
|
||||
add r0, r4, #0
|
||||
add r0, #0xa
|
||||
@ -18548,7 +18548,7 @@ ov83_022475EC: ; 0x022475EC
|
||||
push {r4, lr}
|
||||
add r4, r0, #0
|
||||
add r0, r1, #0
|
||||
bl sub_02074484
|
||||
bl Pokemon_GetIconPalette
|
||||
add r1, r0, #0
|
||||
ldr r0, [r4, #4]
|
||||
bl sub_02024AA8
|
||||
|
||||
@ -3315,7 +3315,7 @@ _0223F6A0:
|
||||
str r0, [sp, #0x1c]
|
||||
_0223F6B4:
|
||||
ldr r0, [sp, #0x20]
|
||||
bl sub_020741B0
|
||||
bl Pokemon_GetIconNaix
|
||||
add r2, r0, #0
|
||||
add r0, r4, #3
|
||||
str r0, [sp]
|
||||
@ -3332,7 +3332,7 @@ _0223F6B4:
|
||||
lsl r1, r1, #2
|
||||
str r0, [r5, r1]
|
||||
ldr r0, [sp, #0x1c]
|
||||
bl sub_020741B0
|
||||
bl Pokemon_GetIconNaix
|
||||
add r2, r0, #0
|
||||
add r0, r4, #7
|
||||
str r0, [sp]
|
||||
@ -3569,7 +3569,7 @@ ov84_0223F894: ; 0x0223F894
|
||||
push {r4, lr}
|
||||
add r4, r0, #0
|
||||
add r0, r1, #0
|
||||
bl sub_02074484
|
||||
bl Pokemon_GetIconPalette
|
||||
add r1, r0, #0
|
||||
ldr r0, [r4, #0x10]
|
||||
bl sub_02024AA8
|
||||
|
||||
@ -2296,11 +2296,11 @@ _021E69CE:
|
||||
str r0, [r1, #0x40]
|
||||
mov r0, #1
|
||||
add r1, r0, #0
|
||||
bl sub_02027000
|
||||
bl GF_3DVramMan_InitFrameTexVramManager
|
||||
mov r0, #1
|
||||
lsl r0, r0, #0xe
|
||||
mov r1, #1
|
||||
bl sub_02027008
|
||||
bl GF_3DVramMan_InitFramePlttVramManager
|
||||
add sp, #4
|
||||
pop {r3, r4, pc}
|
||||
.balign 4, 0
|
||||
|
||||
@ -2516,7 +2516,7 @@ ov89_02259D70: ; 0x02259D70
|
||||
str r1, [sp, #4]
|
||||
mov r1, #0
|
||||
add r3, r1, #0
|
||||
bl sub_02026EB4
|
||||
bl GF_3DVramMan_Create
|
||||
add sp, #8
|
||||
pop {r3, pc}
|
||||
.balign 4, 0
|
||||
@ -2587,10 +2587,10 @@ _02259E0C: .word 0x04000580
|
||||
|
||||
thumb_func_start ov89_02259E10
|
||||
ov89_02259E10: ; 0x02259E10
|
||||
ldr r3, _02259E14 ; =sub_02026F54
|
||||
ldr r3, _02259E14 ; =GF_3DVramMan_Delete
|
||||
bx r3
|
||||
.balign 4, 0
|
||||
_02259E14: .word sub_02026F54
|
||||
_02259E14: .word GF_3DVramMan_Delete
|
||||
thumb_func_end ov89_02259E10
|
||||
|
||||
thumb_func_start ov89_02259E18
|
||||
|
||||
@ -6358,7 +6358,7 @@ ov91_0225F4C0: ; 0x0225F4C0
|
||||
add r0, r4, #0
|
||||
mov r2, #1
|
||||
add r3, r1, #0
|
||||
bl sub_02026EB4
|
||||
bl GF_3DVramMan_Create
|
||||
str r0, [r5, #0x18]
|
||||
add r0, r5, #0
|
||||
add r1, r6, #0
|
||||
@ -6377,7 +6377,7 @@ ov91_0225F4F8: ; 0x0225F4F8
|
||||
add r4, r0, #0
|
||||
bl ov91_0225FDC8
|
||||
ldr r0, [r4, #0x18]
|
||||
bl sub_02026F54
|
||||
bl GF_3DVramMan_Delete
|
||||
pop {r4, pc}
|
||||
thumb_func_end ov91_0225F4F8
|
||||
|
||||
|
||||
@ -1791,7 +1791,7 @@ ov92_0225D3CC: ; 0x0225D3CC
|
||||
mov r0, #0x71
|
||||
mov r2, #1
|
||||
add r3, r1, #0
|
||||
bl sub_02026EB4
|
||||
bl GF_3DVramMan_Create
|
||||
str r0, [r4, #0x60]
|
||||
mov r0, #0x71
|
||||
bl sub_02023114
|
||||
@ -1928,7 +1928,7 @@ ov92_0225D49C: ; 0x0225D49C
|
||||
ldr r0, [r4, #0x4c]
|
||||
bl NARC_dtor
|
||||
ldr r0, [r4, #0x60]
|
||||
bl sub_02026F54
|
||||
bl GF_3DVramMan_Delete
|
||||
ldr r0, [r4, #0x64]
|
||||
bl sub_02023120
|
||||
ldr r0, [r4, #0x50]
|
||||
|
||||
@ -1150,7 +1150,7 @@ ov93_0225CF14: ; 0x0225CF14
|
||||
str r1, [sp, #4]
|
||||
mov r1, #0
|
||||
add r3, r1, #0
|
||||
bl sub_02026EB4
|
||||
bl GF_3DVramMan_Create
|
||||
add sp, #8
|
||||
pop {r3, pc}
|
||||
nop
|
||||
@ -1221,10 +1221,10 @@ _0225CFB4: .word 0x04000580
|
||||
|
||||
thumb_func_start ov93_0225CFB8
|
||||
ov93_0225CFB8: ; 0x0225CFB8
|
||||
ldr r3, _0225CFBC ; =sub_02026F54
|
||||
ldr r3, _0225CFBC ; =GF_3DVramMan_Delete
|
||||
bx r3
|
||||
.balign 4, 0
|
||||
_0225CFBC: .word sub_02026F54
|
||||
_0225CFBC: .word GF_3DVramMan_Delete
|
||||
thumb_func_end ov93_0225CFB8
|
||||
|
||||
thumb_func_start ov93_0225CFC0
|
||||
|
||||
133
asm/overlay_95.s
133
asm/overlay_95.s
@ -58,7 +58,7 @@ ov95_021E5954: ; 0x021E5954
|
||||
str r0, [sp, #4]
|
||||
mov r0, #0x46
|
||||
add r3, r1, #0
|
||||
bl sub_02026EB4
|
||||
bl GF_3DVramMan_Create
|
||||
add sp, #8
|
||||
pop {r3, pc}
|
||||
nop
|
||||
@ -200,7 +200,7 @@ _021E5A48:
|
||||
lsl r1, r1, #0x14
|
||||
lsl r2, r2, #0x10
|
||||
bl MIi_CpuClear32
|
||||
ldr r5, _021E5B18 ; =_021E7538
|
||||
ldr r5, _021E5B18 ; =ov95_021E7538
|
||||
add r3, sp, #0
|
||||
add r2, r3, #0
|
||||
ldmia r5!, {r0, r1}
|
||||
@ -260,7 +260,7 @@ _021E5AA8:
|
||||
pop {r4, r5, pc}
|
||||
.balign 4, 0
|
||||
_021E5B14: .word ov95_021E75B4
|
||||
_021E5B18: .word _021E7538
|
||||
_021E5B18: .word ov95_021E7538
|
||||
_021E5B1C: .word ov95_021E767C
|
||||
_021E5B20: .word 0x04000008
|
||||
thumb_func_end ov95_021E5A38
|
||||
@ -2779,7 +2779,7 @@ ov95_021E6F0C: ; 0x021E6F0C
|
||||
ldr r0, [r0]
|
||||
bl ov95_021E7078
|
||||
ldr r0, [r4, #0x38]
|
||||
bl sub_02026F54
|
||||
bl GF_3DVramMan_Delete
|
||||
mov r0, #1
|
||||
mov r1, #0
|
||||
bl GX_EngineAToggleLayers
|
||||
@ -3401,7 +3401,7 @@ _021E7432:
|
||||
_021E7436:
|
||||
ldr r1, _021E7448 ; =ov95_021E7818
|
||||
lsl r3, r4, #2
|
||||
ldr r2, _021E744C ; =ov95_021E781A
|
||||
ldr r2, _021E744C ; =ov95_021E7818 + 2
|
||||
ldrsh r1, [r1, r3]
|
||||
ldrsh r2, [r2, r3]
|
||||
ldr r0, [r5, #0x10]
|
||||
@ -3409,7 +3409,7 @@ _021E7436:
|
||||
pop {r3, r4, r5, pc}
|
||||
.balign 4, 0
|
||||
_021E7448: .word ov95_021E7818
|
||||
_021E744C: .word ov95_021E781A
|
||||
_021E744C: .word ov95_021E7818 + 2
|
||||
thumb_func_end ov95_021E7410
|
||||
|
||||
thumb_func_start ov95_021E7450
|
||||
@ -3534,57 +3534,99 @@ _021E7534:
|
||||
|
||||
.rodata
|
||||
|
||||
_021E7538:
|
||||
.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
|
||||
.public ov95_021E7538
|
||||
ov95_021E7538:
|
||||
.word 0x00000001
|
||||
.word 0x00000000
|
||||
.word 0x00000000
|
||||
.word 0x00000001
|
||||
|
||||
ov95_021E7548: ; 0x021E7548
|
||||
.byte 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00
|
||||
.byte 0x00, 0x40, 0x00, 0x00, 0x10, 0x00, 0x10, 0x00, 0x10, 0x00, 0x00, 0x00
|
||||
.word 0x00000060
|
||||
.word 0x00010000
|
||||
.word 0x00004000
|
||||
.word 0x00100010
|
||||
.word 0x00000010
|
||||
|
||||
ov95_021E755C: ; 0x021E755C
|
||||
.byte 0x60, 0x00, 0x00, 0x00
|
||||
.byte 0x20, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00
|
||||
.byte 0x10, 0x00, 0x00, 0x00
|
||||
.word 0x00000060
|
||||
.word 0x00000020
|
||||
.word 0x00000040
|
||||
.word 0x00000040
|
||||
.word 0x00000010
|
||||
.word 0x00000010
|
||||
|
||||
ov95_021E7574: ; 0x021E7574
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x20, 0x00, 0x00, 0x00
|
||||
.word 0x00000000
|
||||
.word 0x00000080
|
||||
.word 0x00000000
|
||||
.word 0x00000020
|
||||
.word 0x00000000
|
||||
.word 0x00000080
|
||||
.word 0x00000000
|
||||
.word 0x00000020
|
||||
|
||||
ov95_021E7594: ; 0x021E7594
|
||||
.byte 0x04, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
|
||||
.byte 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
|
||||
.byte 0x02, 0x00, 0x00, 0x00
|
||||
.word 0x00000004
|
||||
.word 0x00000009
|
||||
.word 0x00000003
|
||||
.word 0x00000002
|
||||
.word 0x00000004
|
||||
.word 0x00000009
|
||||
.word 0x00000003
|
||||
.word 0x00000002
|
||||
|
||||
.balign 4, 0
|
||||
.public ov95_021E75B4
|
||||
ov95_021E75B4: ; 0x021E75B4
|
||||
.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00
|
||||
.word 0x00000001
|
||||
.word 0x00000000
|
||||
.word 0x00000080
|
||||
.word 0x00000000
|
||||
.word 0x00000010
|
||||
.word 0x00000000
|
||||
.word 0x00000100
|
||||
.word 0x00000000
|
||||
.word 0x00000006
|
||||
.word 0x00000060
|
||||
|
||||
.balign 2, 0
|
||||
ov95_021E75DC: ; 0x021E75DC
|
||||
.byte 0xFF, 0xFF, 0x01, 0x00
|
||||
.byte 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0x00
|
||||
.byte 0xFE, 0xFF, 0x02, 0x00, 0x02, 0x00, 0xFE, 0xFF, 0xFE, 0xFF, 0x02, 0x00, 0x02, 0x00, 0xFE, 0xFF
|
||||
.byte 0xFF, 0x00, 0xFF, 0x00, 0xFD, 0xFF, 0x03, 0x00, 0x03, 0x00, 0xFD, 0xFF, 0xFD, 0xFF, 0x03, 0x00
|
||||
.byte 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFD, 0xFF, 0x03, 0x00, 0x03, 0x00, 0xFD, 0xFF
|
||||
.byte 0xFD, 0xFF, 0x03, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.short -1, 1, 1, -1, -1, 1, 1, -1, 255, 255
|
||||
.short -2, 2, 2, -2, -2, 2, 2, -2, 255, 255
|
||||
.short -3, 3, 3, -3, -3, 3, 255, 255, 0, 0
|
||||
.short -3, 3, 3, -3, -3, 3, 255, 255, 0, 0
|
||||
|
||||
.balign 2, 0
|
||||
ov95_021E762C: ; 0x021E762C
|
||||
.byte 0x00, 0x00, 0xFF, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0xFF, 0xFF
|
||||
.byte 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00
|
||||
.byte 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00
|
||||
.short 0, 255, 0, 0, 0, 0, 0, 0, 0, 0
|
||||
.short 0, 0, 1, 1, 0, -1, -1, 0, 0, 255
|
||||
.short 0, 0, 1, 1, 1, -1, -1, -1, 0, 0
|
||||
.short 0, 0, 1, 1, 1, -1, -1, -1, 0, 0
|
||||
|
||||
.public ov95_021E767C
|
||||
.balign 4, 0
|
||||
ov95_021E767C: ; 0x021E767C
|
||||
.byte 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x03, 0x00, 0x01, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x06, 0x04, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.word 0
|
||||
.word 0
|
||||
.word 0x800
|
||||
.word 0
|
||||
.byte 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00
|
||||
.word 0
|
||||
|
||||
.word 0
|
||||
.word 0
|
||||
.word 0x2000
|
||||
.word 0
|
||||
.byte 0x01, 0x00, 0x02, 0x03, 0x00, 0x01, 0x00, 0x00
|
||||
.word 0
|
||||
|
||||
.word 0
|
||||
.word 0
|
||||
.word 0x1000
|
||||
.word 0
|
||||
.byte 0x01, 0x00, 0x06, 0x04, 0x00, 0x02, 0x00, 0x00
|
||||
.word 0
|
||||
|
||||
ov95_021E76D0: ; 0x021E76D0
|
||||
.byte 0x00, 0x00, 0x80, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
@ -3611,13 +3653,12 @@ ov95_021E7770: ; 0x021E7770
|
||||
.byte 0xCD, 0xCC, 0x4C, 0x3F, 0x66, 0x66, 0x66, 0x3F, 0x00, 0x00, 0x80, 0x3F, 0x00, 0x00, 0x80, 0x3F
|
||||
|
||||
ov95_021E7810: ; 0x021E7810
|
||||
.byte 0x15, 0x63, 0x1E, 0x02, 0xA1, 0x65, 0x1E, 0x02
|
||||
.word ov95_021E6314
|
||||
.word ov95_021E65A0
|
||||
|
||||
ov95_021E7818: ; 0x021E7818
|
||||
.byte 0x80, 0x00
|
||||
|
||||
ov95_021E781A: ; 0x021E781A
|
||||
.byte 0x48, 0x00, 0x80, 0x00, 0x78, 0x00
|
||||
.short 0x0080, 0x0048
|
||||
.short 0x0080, 0x0078
|
||||
|
||||
ov95_021E7820: ; 0x021E7820
|
||||
.byte 0x32, 0x5C, 0x03, 0xFB, 0x63, 0x8C, 0x03, 0xFB, 0xFF, 0x00, 0x00, 0x00
|
||||
|
||||
@ -19695,7 +19695,7 @@ ov96_021EECB8: ; 0x021EECB8
|
||||
ldrh r2, [r4, #2]
|
||||
mov r1, #0
|
||||
add r7, r3, #0
|
||||
bl sub_020741BC
|
||||
bl GetMonIconNaixEx
|
||||
add r1, r0, #0
|
||||
ldr r0, [sp, #0x24]
|
||||
mov r2, #0
|
||||
@ -19719,7 +19719,7 @@ _021EECE6:
|
||||
ldrh r0, [r4]
|
||||
ldrh r1, [r4, #2]
|
||||
mov r2, #0
|
||||
bl sub_02074364
|
||||
bl GetMonIconPaletteEx
|
||||
add r1, r0, #0
|
||||
add r0, r5, #0
|
||||
add r1, r6, r1
|
||||
@ -46914,7 +46914,7 @@ _021FC52A:
|
||||
ldr r2, [sp, #0xc]
|
||||
add r0, r6, #0
|
||||
mov r1, #0
|
||||
bl sub_020741BC
|
||||
bl GetMonIconNaixEx
|
||||
add r1, r0, #0
|
||||
ldr r0, [sp, #0x14]
|
||||
ldr r2, [sp, #0x10]
|
||||
@ -46925,7 +46925,7 @@ _021FC52A:
|
||||
ldr r1, [sp, #0xc]
|
||||
add r0, r6, #0
|
||||
mov r2, #0
|
||||
bl sub_02074364
|
||||
bl GetMonIconPaletteEx
|
||||
add r0, r0, #3
|
||||
lsl r0, r0, #0x18
|
||||
lsr r6, r0, #0x18
|
||||
@ -54663,7 +54663,7 @@ _0220032E:
|
||||
ldrh r0, [r5]
|
||||
ldr r2, [sp, #0xc]
|
||||
str r0, [sp, #8]
|
||||
bl sub_020741BC
|
||||
bl GetMonIconNaixEx
|
||||
add r2, r4, #0
|
||||
add r2, #0xbc
|
||||
add r1, r0, #0
|
||||
@ -54678,7 +54678,7 @@ _0220032E:
|
||||
ldr r0, [sp, #8]
|
||||
ldr r1, [sp, #0xc]
|
||||
mov r2, #0
|
||||
bl sub_02074364
|
||||
bl GetMonIconPaletteEx
|
||||
add r2, r0, #1
|
||||
mov r0, #0x47
|
||||
add r1, r6, r7
|
||||
@ -70354,7 +70354,7 @@ _0220812A:
|
||||
ldrh r0, [r5]
|
||||
ldr r2, [sp, #0x14]
|
||||
str r0, [sp, #0x10]
|
||||
bl sub_020741BC
|
||||
bl GetMonIconNaixEx
|
||||
add r2, r4, #0
|
||||
add r2, #0x9c
|
||||
add r1, r0, #0
|
||||
@ -70369,7 +70369,7 @@ _0220812A:
|
||||
ldr r0, [sp, #0x10]
|
||||
ldr r1, [sp, #0x14]
|
||||
mov r2, #0
|
||||
bl sub_02074364
|
||||
bl GetMonIconPaletteEx
|
||||
add r1, r0, #6
|
||||
ldr r0, [sp, #8]
|
||||
add r4, r4, #4
|
||||
|
||||
@ -510,7 +510,7 @@ _0221E984:
|
||||
ldr r2, [sp]
|
||||
add r0, r7, #0
|
||||
mov r1, #0
|
||||
bl sub_020741BC
|
||||
bl GetMonIconNaixEx
|
||||
add r1, r0, #0
|
||||
add r0, r6, #0
|
||||
add r2, sp, #8
|
||||
@ -529,7 +529,7 @@ _0221E984:
|
||||
ldr r1, [sp]
|
||||
add r0, r7, #0
|
||||
mov r2, #0
|
||||
bl sub_02074364
|
||||
bl GetMonIconPaletteEx
|
||||
mov r1, #0x14
|
||||
add r2, r0, #0
|
||||
ldrsb r1, [r6, r1]
|
||||
|
||||
@ -1,350 +0,0 @@
|
||||
#include "constants/easy_chat.h"
|
||||
#include "constants/items.h"
|
||||
#include "constants/maps.h"
|
||||
#include "constants/moves.h"
|
||||
#include "constants/species.h"
|
||||
.include "asm/macros.inc"
|
||||
.include "global.inc"
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start ShowSaveDataReadError
|
||||
ShowSaveDataReadError: ; 0x0209263C
|
||||
push {r3, r4, r5, r6, lr}
|
||||
sub sp, #0x1c
|
||||
add r4, r0, #0
|
||||
mov r0, #0
|
||||
add r1, r0, #0
|
||||
bl sub_0200FBF4
|
||||
mov r0, #1
|
||||
mov r1, #0
|
||||
bl sub_0200FBF4
|
||||
mov r0, #0
|
||||
add r1, r0, #0
|
||||
bl Main_SetVBlankIntrCB
|
||||
mov r0, #0
|
||||
add r1, r0, #0
|
||||
bl Main_SetHBlankIntrCB
|
||||
bl GX_DisableEngineALayers
|
||||
bl GX_DisableEngineBLayers
|
||||
mov r2, #1
|
||||
lsl r2, r2, #0x1a
|
||||
ldr r1, [r2]
|
||||
ldr r0, _020927A0 ; =0xFFFFE0FF
|
||||
and r1, r0
|
||||
str r1, [r2]
|
||||
ldr r2, _020927A4 ; =0x04001000
|
||||
ldr r1, [r2]
|
||||
and r0, r1
|
||||
str r0, [r2]
|
||||
mov r0, #4
|
||||
mov r1, #8
|
||||
bl SetKeyRepeatTimers
|
||||
ldr r0, _020927A8 ; =gSystem + 0x60
|
||||
mov r1, #0
|
||||
strb r1, [r0, #9]
|
||||
bl GX_SwapDisplay
|
||||
ldr r3, _020927AC ; =0x04000050
|
||||
mov r0, #0
|
||||
strh r0, [r3]
|
||||
ldr r2, _020927B0 ; =0x04001050
|
||||
sub r3, #0x50
|
||||
strh r0, [r2]
|
||||
ldr r1, [r3]
|
||||
ldr r0, _020927B4 ; =0xFFFF1FFF
|
||||
sub r2, #0x50
|
||||
and r1, r0
|
||||
str r1, [r3]
|
||||
ldr r1, [r2]
|
||||
and r0, r1
|
||||
str r0, [r2]
|
||||
ldr r0, _020927B8 ; =_021082BC
|
||||
bl GX_SetBanks
|
||||
add r0, r4, #0
|
||||
bl BgConfig_Alloc
|
||||
add r5, r0, #0
|
||||
ldr r0, _020927BC ; =_02108290
|
||||
bl SetBothScreensModesAndDisable
|
||||
mov r1, #0
|
||||
ldr r2, _020927C0 ; =_021082A0
|
||||
add r0, r5, #0
|
||||
add r3, r1, #0
|
||||
bl InitBgFromTemplate
|
||||
add r0, r5, #0
|
||||
mov r1, #0
|
||||
bl BgClearTilemapBufferAndCommit
|
||||
mov r1, #0
|
||||
str r1, [sp]
|
||||
ldr r2, _020927C4 ; =0x000001F7
|
||||
add r0, r5, #0
|
||||
mov r3, #2
|
||||
str r4, [sp, #4]
|
||||
bl sub_0200E3DC
|
||||
mov r0, #0
|
||||
mov r1, #0x20
|
||||
add r2, r4, #0
|
||||
bl sub_02003030
|
||||
mov r0, #0
|
||||
mov r1, #0x20
|
||||
add r2, r0, #0
|
||||
add r3, r4, #0
|
||||
bl BG_ClearCharDataRange
|
||||
ldr r1, _020927C8 ; =0x00006C21
|
||||
mov r0, #0
|
||||
bl BG_SetMaskColor
|
||||
ldr r1, _020927C8 ; =0x00006C21
|
||||
mov r0, #4
|
||||
bl BG_SetMaskColor
|
||||
mov r0, #1
|
||||
mov r1, #0x1b
|
||||
mov r2, #8
|
||||
add r3, r4, #0
|
||||
bl NewMsgDataFromNarc
|
||||
add r6, r0, #0
|
||||
mov r0, #6
|
||||
lsl r0, r0, #6
|
||||
add r1, r4, #0
|
||||
bl String_ctor
|
||||
add r4, r0, #0
|
||||
bl sub_02020080
|
||||
ldr r2, _020927CC ; =_02108288
|
||||
add r0, r5, #0
|
||||
add r1, sp, #0xc
|
||||
bl AddWindow
|
||||
mov r0, #0xd0
|
||||
str r0, [sp]
|
||||
mov r0, #0x90
|
||||
mov r2, #0
|
||||
str r0, [sp, #4]
|
||||
add r0, sp, #0xc
|
||||
mov r1, #0xf
|
||||
add r3, r2, #0
|
||||
bl FillWindowPixelRect
|
||||
ldr r2, _020927C4 ; =0x000001F7
|
||||
add r0, sp, #0xc
|
||||
mov r1, #0
|
||||
mov r3, #2
|
||||
bl DrawFrameAndWindow1
|
||||
add r0, r6, #0
|
||||
mov r1, #0
|
||||
add r2, r4, #0
|
||||
bl ReadMsgDataIntoString
|
||||
mov r1, #0
|
||||
str r1, [sp]
|
||||
str r1, [sp, #4]
|
||||
add r0, sp, #0xc
|
||||
add r2, r4, #0
|
||||
add r3, r1, #0
|
||||
str r1, [sp, #8]
|
||||
bl AddTextPrinterParameterized
|
||||
add r0, r4, #0
|
||||
bl String_dtor
|
||||
bl GX_BothDispOn
|
||||
mov r0, #0
|
||||
bl SetMasterBrightnessNeutral
|
||||
mov r0, #1
|
||||
bl SetMasterBrightnessNeutral
|
||||
mov r0, #0
|
||||
mov r1, #0x3f
|
||||
mov r2, #3
|
||||
bl SetBlendBrightness
|
||||
mov r4, #1
|
||||
_02092790:
|
||||
bl HandleDSLidAction
|
||||
add r0, r4, #0
|
||||
add r1, r4, #0
|
||||
bl OS_WaitIrq
|
||||
b _02092790
|
||||
nop
|
||||
_020927A0: .word 0xFFFFE0FF
|
||||
_020927A4: .word 0x04001000
|
||||
_020927A8: .word gSystem + 0x60
|
||||
_020927AC: .word 0x04000050
|
||||
_020927B0: .word 0x04001050
|
||||
_020927B4: .word 0xFFFF1FFF
|
||||
_020927B8: .word _021082BC
|
||||
_020927BC: .word _02108290
|
||||
_020927C0: .word _021082A0
|
||||
_020927C4: .word 0x000001F7
|
||||
_020927C8: .word 0x00006C21
|
||||
_020927CC: .word _02108288
|
||||
thumb_func_end ShowSaveDataReadError
|
||||
|
||||
thumb_func_start ShowGBACartRemovedError
|
||||
ShowGBACartRemovedError: ; 0x020927D0
|
||||
push {r3, r4, r5, r6, lr}
|
||||
sub sp, #0x1c
|
||||
add r4, r0, #0
|
||||
mov r0, #0
|
||||
add r1, r0, #0
|
||||
bl sub_0200FBF4
|
||||
mov r0, #1
|
||||
mov r1, #0
|
||||
bl sub_0200FBF4
|
||||
mov r0, #0
|
||||
add r1, r0, #0
|
||||
bl Main_SetVBlankIntrCB
|
||||
mov r0, #0
|
||||
add r1, r0, #0
|
||||
bl Main_SetHBlankIntrCB
|
||||
bl GX_DisableEngineALayers
|
||||
bl GX_DisableEngineBLayers
|
||||
mov r2, #1
|
||||
lsl r2, r2, #0x1a
|
||||
ldr r1, [r2]
|
||||
ldr r0, _02092934 ; =0xFFFFE0FF
|
||||
and r1, r0
|
||||
str r1, [r2]
|
||||
ldr r2, _02092938 ; =0x04001000
|
||||
ldr r1, [r2]
|
||||
and r0, r1
|
||||
str r0, [r2]
|
||||
mov r0, #4
|
||||
mov r1, #8
|
||||
bl SetKeyRepeatTimers
|
||||
ldr r0, _0209293C ; =gSystem + 0x60
|
||||
mov r1, #0
|
||||
strb r1, [r0, #9]
|
||||
bl GX_SwapDisplay
|
||||
ldr r3, _02092940 ; =0x04000050
|
||||
mov r0, #0
|
||||
strh r0, [r3]
|
||||
ldr r2, _02092944 ; =0x04001050
|
||||
sub r3, #0x50
|
||||
strh r0, [r2]
|
||||
ldr r1, [r3]
|
||||
ldr r0, _02092948 ; =0xFFFF1FFF
|
||||
sub r2, #0x50
|
||||
and r1, r0
|
||||
str r1, [r3]
|
||||
ldr r1, [r2]
|
||||
and r0, r1
|
||||
str r0, [r2]
|
||||
ldr r0, _0209294C ; =_021082BC
|
||||
bl GX_SetBanks
|
||||
add r0, r4, #0
|
||||
bl BgConfig_Alloc
|
||||
add r5, r0, #0
|
||||
ldr r0, _02092950 ; =_02108290
|
||||
bl SetBothScreensModesAndDisable
|
||||
mov r1, #0
|
||||
ldr r2, _02092954 ; =_021082A0
|
||||
add r0, r5, #0
|
||||
add r3, r1, #0
|
||||
bl InitBgFromTemplate
|
||||
add r0, r5, #0
|
||||
mov r1, #0
|
||||
bl BgClearTilemapBufferAndCommit
|
||||
mov r1, #0
|
||||
str r1, [sp]
|
||||
ldr r2, _02092958 ; =0x000001F7
|
||||
add r0, r5, #0
|
||||
mov r3, #2
|
||||
str r4, [sp, #4]
|
||||
bl sub_0200E3DC
|
||||
mov r0, #0
|
||||
mov r1, #0x20
|
||||
add r2, r4, #0
|
||||
bl sub_02003030
|
||||
mov r0, #0
|
||||
mov r1, #0x20
|
||||
add r2, r0, #0
|
||||
add r3, r4, #0
|
||||
bl BG_ClearCharDataRange
|
||||
ldr r1, _0209295C ; =0x00006C21
|
||||
mov r0, #0
|
||||
bl BG_SetMaskColor
|
||||
ldr r1, _0209295C ; =0x00006C21
|
||||
mov r0, #4
|
||||
bl BG_SetMaskColor
|
||||
mov r0, #1
|
||||
mov r1, #0x1b
|
||||
mov r2, #8
|
||||
add r3, r4, #0
|
||||
bl NewMsgDataFromNarc
|
||||
add r6, r0, #0
|
||||
mov r0, #6
|
||||
lsl r0, r0, #6
|
||||
add r1, r4, #0
|
||||
bl String_ctor
|
||||
add r4, r0, #0
|
||||
bl sub_02020080
|
||||
ldr r2, _02092960 ; =_02108288
|
||||
add r0, r5, #0
|
||||
add r1, sp, #0xc
|
||||
bl AddWindow
|
||||
mov r0, #0xd0
|
||||
str r0, [sp]
|
||||
mov r0, #0x90
|
||||
mov r2, #0
|
||||
str r0, [sp, #4]
|
||||
add r0, sp, #0xc
|
||||
mov r1, #0xf
|
||||
add r3, r2, #0
|
||||
bl FillWindowPixelRect
|
||||
ldr r2, _02092958 ; =0x000001F7
|
||||
add r0, sp, #0xc
|
||||
mov r1, #0
|
||||
mov r3, #2
|
||||
bl DrawFrameAndWindow1
|
||||
add r0, r6, #0
|
||||
mov r1, #1
|
||||
add r2, r4, #0
|
||||
bl ReadMsgDataIntoString
|
||||
mov r1, #0
|
||||
str r1, [sp]
|
||||
str r1, [sp, #4]
|
||||
add r0, sp, #0xc
|
||||
add r2, r4, #0
|
||||
add r3, r1, #0
|
||||
str r1, [sp, #8]
|
||||
bl AddTextPrinterParameterized
|
||||
add r0, r4, #0
|
||||
bl String_dtor
|
||||
bl GX_BothDispOn
|
||||
mov r0, #0
|
||||
bl SetMasterBrightnessNeutral
|
||||
mov r0, #1
|
||||
bl SetMasterBrightnessNeutral
|
||||
mov r0, #0
|
||||
mov r1, #0x3f
|
||||
mov r2, #3
|
||||
bl SetBlendBrightness
|
||||
mov r4, #1
|
||||
_02092924:
|
||||
bl HandleDSLidAction
|
||||
add r0, r4, #0
|
||||
add r1, r4, #0
|
||||
bl OS_WaitIrq
|
||||
b _02092924
|
||||
nop
|
||||
_02092934: .word 0xFFFFE0FF
|
||||
_02092938: .word 0x04001000
|
||||
_0209293C: .word gSystem + 0x60
|
||||
_02092940: .word 0x04000050
|
||||
_02092944: .word 0x04001050
|
||||
_02092948: .word 0xFFFF1FFF
|
||||
_0209294C: .word _021082BC
|
||||
_02092950: .word _02108290
|
||||
_02092954: .word _021082A0
|
||||
_02092958: .word 0x000001F7
|
||||
_0209295C: .word 0x00006C21
|
||||
_02092960: .word _02108288
|
||||
thumb_func_end ShowGBACartRemovedError
|
||||
|
||||
.rodata
|
||||
|
||||
; File boundary
|
||||
_02108288:
|
||||
.byte 0x00, 0x03, 0x03, 0x1A, 0x12, 0x01
|
||||
.short 0x0023
|
||||
_02108290:
|
||||
.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
_021082A0:
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x01, 0x00, 0x00, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
_021082BC:
|
||||
.byte 0x03, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00
|
||||
@ -1,197 +0,0 @@
|
||||
#include "constants/easy_chat.h"
|
||||
#include "constants/items.h"
|
||||
#include "constants/maps.h"
|
||||
#include "constants/moves.h"
|
||||
#include "constants/species.h"
|
||||
.include "asm/macros.inc"
|
||||
.include "global.inc"
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start ShowSaveDataWriteError
|
||||
ShowSaveDataWriteError: ; 0x02092964
|
||||
push {r4, r5, r6, r7, lr}
|
||||
sub sp, #0x1c
|
||||
add r4, r0, #0
|
||||
cmp r1, #0
|
||||
bne _02092972
|
||||
mov r6, #1
|
||||
b _02092974
|
||||
_02092972:
|
||||
mov r6, #0
|
||||
_02092974:
|
||||
mov r0, #0
|
||||
add r1, r0, #0
|
||||
bl sub_0200FBF4
|
||||
mov r0, #1
|
||||
mov r1, #0
|
||||
bl sub_0200FBF4
|
||||
bl sub_0201A0E0
|
||||
mov r0, #0
|
||||
add r1, r0, #0
|
||||
bl Main_SetVBlankIntrCB
|
||||
mov r0, #0
|
||||
add r1, r0, #0
|
||||
bl Main_SetHBlankIntrCB
|
||||
bl GX_DisableEngineALayers
|
||||
bl GX_DisableEngineBLayers
|
||||
mov r2, #1
|
||||
lsl r2, r2, #0x1a
|
||||
ldr r1, [r2]
|
||||
ldr r0, _02092AD4 ; =0xFFFFE0FF
|
||||
and r1, r0
|
||||
str r1, [r2]
|
||||
ldr r2, _02092AD8 ; =0x04001000
|
||||
ldr r1, [r2]
|
||||
and r0, r1
|
||||
str r0, [r2]
|
||||
mov r0, #4
|
||||
mov r1, #8
|
||||
bl SetKeyRepeatTimers
|
||||
ldr r0, _02092ADC ; =gSystem + 0x60
|
||||
mov r1, #0
|
||||
strb r1, [r0, #9]
|
||||
bl GX_SwapDisplay
|
||||
ldr r3, _02092AE0 ; =0x04000050
|
||||
mov r1, #0
|
||||
strh r1, [r3]
|
||||
ldr r0, _02092AE4 ; =0x04001050
|
||||
sub r3, #0x50
|
||||
strh r1, [r0]
|
||||
ldr r2, [r3]
|
||||
ldr r1, _02092AE8 ; =0xFFFF1FFF
|
||||
sub r0, #0x50
|
||||
and r2, r1
|
||||
str r2, [r3]
|
||||
ldr r2, [r0]
|
||||
and r1, r2
|
||||
str r1, [r0]
|
||||
ldr r0, _02092AEC ; =_02108318
|
||||
bl GX_SetBanks
|
||||
add r0, r4, #0
|
||||
bl BgConfig_Alloc
|
||||
add r5, r0, #0
|
||||
ldr r0, _02092AF0 ; =_021082EC
|
||||
bl SetBothScreensModesAndDisable
|
||||
mov r1, #0
|
||||
ldr r2, _02092AF4 ; =_021082FC
|
||||
add r0, r5, #0
|
||||
add r3, r1, #0
|
||||
bl InitBgFromTemplate
|
||||
add r0, r5, #0
|
||||
mov r1, #0
|
||||
bl BgClearTilemapBufferAndCommit
|
||||
mov r1, #0
|
||||
str r1, [sp]
|
||||
ldr r2, _02092AF8 ; =0x000001F7
|
||||
add r0, r5, #0
|
||||
mov r3, #2
|
||||
str r4, [sp, #4]
|
||||
bl sub_0200E3DC
|
||||
mov r0, #0
|
||||
mov r1, #0x20
|
||||
add r2, r4, #0
|
||||
bl sub_02003030
|
||||
mov r0, #0
|
||||
mov r1, #0x20
|
||||
add r2, r0, #0
|
||||
add r3, r4, #0
|
||||
bl BG_ClearCharDataRange
|
||||
ldr r1, _02092AFC ; =0x00006C21
|
||||
mov r0, #0
|
||||
bl BG_SetMaskColor
|
||||
ldr r1, _02092AFC ; =0x00006C21
|
||||
mov r0, #4
|
||||
bl BG_SetMaskColor
|
||||
mov r0, #1
|
||||
mov r1, #0x1b
|
||||
mov r2, #9
|
||||
add r3, r4, #0
|
||||
bl NewMsgDataFromNarc
|
||||
add r7, r0, #0
|
||||
mov r0, #6
|
||||
lsl r0, r0, #6
|
||||
add r1, r4, #0
|
||||
bl String_ctor
|
||||
add r4, r0, #0
|
||||
bl sub_02020080
|
||||
ldr r2, _02092B00 ; =_021082E4
|
||||
add r0, r5, #0
|
||||
add r1, sp, #0xc
|
||||
bl AddWindow
|
||||
mov r0, #0xd0
|
||||
str r0, [sp]
|
||||
mov r0, #0x90
|
||||
mov r2, #0
|
||||
str r0, [sp, #4]
|
||||
add r0, sp, #0xc
|
||||
mov r1, #0xf
|
||||
add r3, r2, #0
|
||||
bl FillWindowPixelRect
|
||||
ldr r2, _02092AF8 ; =0x000001F7
|
||||
add r0, sp, #0xc
|
||||
mov r1, #0
|
||||
mov r3, #2
|
||||
bl DrawFrameAndWindow1
|
||||
add r0, r7, #0
|
||||
add r1, r6, #0
|
||||
add r2, r4, #0
|
||||
bl ReadMsgDataIntoString
|
||||
mov r1, #0
|
||||
str r1, [sp]
|
||||
str r1, [sp, #4]
|
||||
add r0, sp, #0xc
|
||||
add r2, r4, #0
|
||||
add r3, r1, #0
|
||||
str r1, [sp, #8]
|
||||
bl AddTextPrinterParameterized
|
||||
add r0, r4, #0
|
||||
bl String_dtor
|
||||
bl GX_BothDispOn
|
||||
mov r0, #0
|
||||
bl SetMasterBrightnessNeutral
|
||||
mov r0, #1
|
||||
bl SetMasterBrightnessNeutral
|
||||
mov r0, #0
|
||||
mov r1, #0x3f
|
||||
mov r2, #3
|
||||
bl SetBlendBrightness
|
||||
mov r4, #1
|
||||
_02092AC6:
|
||||
bl HandleDSLidAction
|
||||
add r0, r4, #0
|
||||
add r1, r4, #0
|
||||
bl OS_WaitIrq
|
||||
b _02092AC6
|
||||
.balign 4, 0
|
||||
_02092AD4: .word 0xFFFFE0FF
|
||||
_02092AD8: .word 0x04001000
|
||||
_02092ADC: .word gSystem + 0x60
|
||||
_02092AE0: .word 0x04000050
|
||||
_02092AE4: .word 0x04001050
|
||||
_02092AE8: .word 0xFFFF1FFF
|
||||
_02092AEC: .word _02108318
|
||||
_02092AF0: .word _021082EC
|
||||
_02092AF4: .word _021082FC
|
||||
_02092AF8: .word 0x000001F7
|
||||
_02092AFC: .word 0x00006C21
|
||||
_02092B00: .word _021082E4
|
||||
thumb_func_end ShowSaveDataWriteError
|
||||
|
||||
.rodata
|
||||
|
||||
; File boundary
|
||||
_021082E4:
|
||||
.byte 0x00, 0x03, 0x03, 0x1A, 0x12, 0x01,
|
||||
.short 0x0023
|
||||
_021082EC:
|
||||
.byte 0x01, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
_021082FC:
|
||||
.byte 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x06
|
||||
.byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
_02108318:
|
||||
.byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
16
asm/scrcmd.s
16
asm/scrcmd.s
@ -6887,7 +6887,7 @@ ScrCmd_249: ; 0x02043E08
|
||||
add r1, r6, #0
|
||||
lsr r2, r2, #0x18
|
||||
add r3, r4, #0
|
||||
bl sub_02051020
|
||||
bl SetupAndStartWildBattle
|
||||
mov r0, #1
|
||||
add sp, #8
|
||||
pop {r4, r5, r6, pc}
|
||||
@ -6931,7 +6931,7 @@ ScrCmd_WildBattle: ; 0x02043E5C
|
||||
str r0, [sp, #4]
|
||||
ldr r0, [r5, #0x74]
|
||||
add r3, r4, #0
|
||||
bl sub_02051020
|
||||
bl SetupAndStartWildBattle
|
||||
mov r0, #1
|
||||
add sp, #8
|
||||
pop {r4, r5, r6, pc}
|
||||
@ -7010,7 +7010,7 @@ ScrCmd_250: ; 0x02043F0C
|
||||
ScrCmd_CatchingTutorial: ; 0x02043F48
|
||||
push {r3, lr}
|
||||
ldr r0, [r0, #0x74]
|
||||
bl sub_02051334
|
||||
bl SetupAndStartTutorialBattle
|
||||
mov r0, #1
|
||||
pop {r3, pc}
|
||||
thumb_func_end ScrCmd_CatchingTutorial
|
||||
@ -12989,13 +12989,13 @@ ScrCmd_606: ; 0x02046DA8
|
||||
ldr r0, [r0]
|
||||
bl FollowingPokemon_GetMapObject
|
||||
add r4, r0, #0
|
||||
bl sub_02069F7C
|
||||
bl FollowPokeObj_GetSpecies
|
||||
add r1, r5, #0
|
||||
add r1, #0x80
|
||||
ldr r1, [r1]
|
||||
ldr r1, [r1, #0x20]
|
||||
ldr r1, [r1]
|
||||
bl sub_02069FF4
|
||||
bl GetFollowPokePermissionBySpeciesAndMap
|
||||
cmp r0, #0
|
||||
beq _02046DF4
|
||||
add r0, r4, #0
|
||||
@ -13026,13 +13026,13 @@ ScrCmd_607: ; 0x02046DF8
|
||||
add r0, #0x80
|
||||
ldr r0, [r0]
|
||||
bl FollowingPokemon_GetMapObject
|
||||
bl sub_02069F7C
|
||||
bl FollowPokeObj_GetSpecies
|
||||
add r1, r4, #0
|
||||
add r1, #0x80
|
||||
ldr r1, [r1]
|
||||
ldr r1, [r1, #0x20]
|
||||
ldr r1, [r1]
|
||||
bl sub_02069FF4
|
||||
bl GetFollowPokePermissionBySpeciesAndMap
|
||||
cmp r0, #0
|
||||
beq _02046E32
|
||||
add r4, #0x80
|
||||
@ -14115,7 +14115,7 @@ ScrCmd_732: ; 0x02047644
|
||||
ldr r0, [r1, r0]
|
||||
mov r1, #0
|
||||
ldrsb r1, [r2, r1]
|
||||
bl sub_0206A1F4
|
||||
bl FsysUnkSub108_AddMonMood
|
||||
mov r0, #0
|
||||
pop {r3, pc}
|
||||
.balign 4, 0
|
||||
|
||||
@ -133,7 +133,7 @@ sub_0201F590: ; 0x0201F590
|
||||
str r1, [sp, #4]
|
||||
mov r1, #0
|
||||
add r3, r1, #0
|
||||
bl sub_02026EB4
|
||||
bl GF_3DVramMan_Create
|
||||
ldr r1, _0201F5B4 ; =_021D15A0
|
||||
str r0, [r1]
|
||||
add sp, #8
|
||||
@ -208,12 +208,12 @@ _0201F638: .word 0x04000580
|
||||
thumb_func_start sub_0201F63C
|
||||
sub_0201F63C: ; 0x0201F63C
|
||||
ldr r0, _0201F644 ; =_021D15A0
|
||||
ldr r3, _0201F648 ; =sub_02026F54
|
||||
ldr r3, _0201F648 ; =GF_3DVramMan_Delete
|
||||
ldr r0, [r0]
|
||||
bx r3
|
||||
.balign 4, 0
|
||||
_0201F644: .word _021D15A0
|
||||
_0201F648: .word sub_02026F54
|
||||
_0201F648: .word GF_3DVramMan_Delete
|
||||
thumb_func_end sub_0201F63C
|
||||
|
||||
thumb_func_start sub_0201F64C
|
||||
|
||||
@ -1,187 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "global.inc"
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_02026EB4
|
||||
sub_02026EB4: ; 0x02026EB4
|
||||
push {r3, r4, r5, r6, r7, lr}
|
||||
sub sp, #8
|
||||
add r7, r1, #0
|
||||
mov r1, #0xc
|
||||
add r6, r0, #0
|
||||
add r5, r2, #0
|
||||
str r3, [sp, #4]
|
||||
bl AllocFromHeap
|
||||
add r4, r0, #0
|
||||
str r6, [r4]
|
||||
bl NNS_G3dInit
|
||||
bl G3X_InitMtxStack
|
||||
mov r1, #2
|
||||
ldr r0, _02026F50 ; =0x04000540
|
||||
cmp r7, #0
|
||||
str r1, [r0]
|
||||
bne _02026F00
|
||||
lsl r0, r5, #7
|
||||
bl NNS_GfdGetLnkTexVramManagerWorkSize
|
||||
add r6, r0, #0
|
||||
ldr r0, [r4]
|
||||
add r1, r6, #0
|
||||
bl AllocFromHeap
|
||||
str r0, [r4, #8]
|
||||
mov r0, #1
|
||||
str r0, [sp]
|
||||
ldr r2, [r4, #8]
|
||||
lsl r0, r5, #0x11
|
||||
mov r1, #0
|
||||
add r3, r6, #0
|
||||
bl sub_02026FE8
|
||||
b _02026F0A
|
||||
_02026F00:
|
||||
lsl r0, r5, #0x10
|
||||
lsr r0, r0, #0x10
|
||||
mov r1, #1
|
||||
bl sub_02027000
|
||||
_02026F0A:
|
||||
ldr r0, [sp, #4]
|
||||
cmp r0, #0
|
||||
bne _02026F34
|
||||
ldr r0, [sp, #0x20]
|
||||
lsl r0, r0, #8
|
||||
bl NNS_GfdGetLnkPlttVramManagerWorkSize
|
||||
add r5, r0, #0
|
||||
ldr r0, [r4]
|
||||
add r1, r5, #0
|
||||
bl AllocFromHeap
|
||||
str r0, [r4, #4]
|
||||
ldr r0, [sp, #0x20]
|
||||
ldr r1, [r4, #4]
|
||||
lsl r0, r0, #0xd
|
||||
add r2, r5, #0
|
||||
mov r3, #1
|
||||
bl sub_02026FF8
|
||||
b _02026F3C
|
||||
_02026F34:
|
||||
ldr r0, [sp, #0x20]
|
||||
mov r1, #1
|
||||
bl sub_02027008
|
||||
_02026F3C:
|
||||
ldr r0, [sp, #0x24]
|
||||
cmp r0, #0
|
||||
beq _02026F46
|
||||
blx r0
|
||||
b _02026F4A
|
||||
_02026F46:
|
||||
bl sub_02026F6C
|
||||
_02026F4A:
|
||||
add r0, r4, #0
|
||||
add sp, #8
|
||||
pop {r3, r4, r5, r6, r7, pc}
|
||||
.balign 4, 0
|
||||
_02026F50: .word 0x04000540
|
||||
thumb_func_end sub_02026EB4
|
||||
|
||||
thumb_func_start sub_02026F54
|
||||
sub_02026F54: ; 0x02026F54
|
||||
push {r4, lr}
|
||||
add r4, r0, #0
|
||||
ldr r0, [r4, #4]
|
||||
bl FreeToHeap
|
||||
ldr r0, [r4, #8]
|
||||
bl FreeToHeap
|
||||
add r0, r4, #0
|
||||
bl FreeToHeap
|
||||
pop {r4, pc}
|
||||
thumb_func_end sub_02026F54
|
||||
|
||||
thumb_func_start sub_02026F6C
|
||||
sub_02026F6C: ; 0x02026F6C
|
||||
push {r3, lr}
|
||||
mov r0, #1
|
||||
add r1, r0, #0
|
||||
bl GX_EngineAToggleLayers
|
||||
ldr r0, _02026FD0 ; =0x04000008
|
||||
mov r1, #3
|
||||
ldrh r2, [r0]
|
||||
bic r2, r1
|
||||
strh r2, [r0]
|
||||
add r0, #0x58
|
||||
ldrh r2, [r0]
|
||||
ldr r1, _02026FD4 ; =0xFFFFCFFD
|
||||
and r1, r2
|
||||
strh r1, [r0]
|
||||
ldrh r1, [r0]
|
||||
ldr r2, _02026FD8 ; =0x0000CFEF
|
||||
and r1, r2
|
||||
strh r1, [r0]
|
||||
add r1, r2, #0
|
||||
ldrh r3, [r0]
|
||||
add r1, #0xc
|
||||
and r1, r3
|
||||
strh r1, [r0]
|
||||
add r1, r2, #0
|
||||
ldrh r3, [r0]
|
||||
add r1, #8
|
||||
sub r2, #0x10
|
||||
and r1, r3
|
||||
strh r1, [r0]
|
||||
ldrh r1, [r0]
|
||||
and r1, r2
|
||||
strh r1, [r0]
|
||||
mov r0, #0
|
||||
add r1, r0, #0
|
||||
add r2, r0, #0
|
||||
add r3, r0, #0
|
||||
bl G3X_SetFog
|
||||
mov r0, #0
|
||||
ldr r2, _02026FDC ; =0x00007FFF
|
||||
add r1, r0, #0
|
||||
mov r3, #0x3f
|
||||
str r0, [sp]
|
||||
bl G3X_SetClearColor
|
||||
ldr r1, _02026FE0 ; =0xBFFF0000
|
||||
ldr r0, _02026FE4 ; =0x04000580
|
||||
str r1, [r0]
|
||||
pop {r3, pc}
|
||||
.balign 4, 0
|
||||
_02026FD0: .word 0x04000008
|
||||
_02026FD4: .word 0xFFFFCFFD
|
||||
_02026FD8: .word 0x0000CFEF
|
||||
_02026FDC: .word 0x00007FFF
|
||||
_02026FE0: .word 0xBFFF0000
|
||||
_02026FE4: .word 0x04000580
|
||||
thumb_func_end sub_02026F6C
|
||||
|
||||
thumb_func_start sub_02026FE8
|
||||
sub_02026FE8: ; 0x02026FE8
|
||||
push {r3, r4, lr}
|
||||
sub sp, #4
|
||||
ldr r4, [sp, #0x10]
|
||||
str r4, [sp]
|
||||
bl NNS_GfdInitLnkTexVramManager
|
||||
add sp, #4
|
||||
pop {r3, r4, pc}
|
||||
thumb_func_end sub_02026FE8
|
||||
|
||||
thumb_func_start sub_02026FF8
|
||||
sub_02026FF8: ; 0x02026FF8
|
||||
push {r3, lr}
|
||||
bl NNS_GfdInitLnkPlttVramManager
|
||||
pop {r3, pc}
|
||||
thumb_func_end sub_02026FF8
|
||||
|
||||
thumb_func_start sub_02027000
|
||||
sub_02027000: ; 0x02027000
|
||||
ldr r3, _02027004 ; =NNS_GfdInitFrmTexVramManager
|
||||
bx r3
|
||||
.balign 4, 0
|
||||
_02027004: .word NNS_GfdInitFrmTexVramManager
|
||||
thumb_func_end sub_02027000
|
||||
|
||||
thumb_func_start sub_02027008
|
||||
sub_02027008: ; 0x02027008
|
||||
ldr r3, _0202700C ; =NNS_GfdInitFrmPlttVramManager
|
||||
bx r3
|
||||
.balign 4, 0
|
||||
_0202700C: .word NNS_GfdInitFrmPlttVramManager
|
||||
thumb_func_end sub_02027008
|
||||
@ -1,29 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "global.inc"
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_02031AF0
|
||||
sub_02031AF0: ; 0x02031AF0
|
||||
mov r0, #0x28
|
||||
bx lr
|
||||
thumb_func_end sub_02031AF0
|
||||
|
||||
thumb_func_start sub_02031AF4
|
||||
sub_02031AF4: ; 0x02031AF4
|
||||
ldr r3, _02031AFC ; =MI_CpuFill8
|
||||
mov r1, #0
|
||||
mov r2, #0x28
|
||||
bx r3
|
||||
.balign 4, 0
|
||||
_02031AFC: .word MI_CpuFill8
|
||||
thumb_func_end sub_02031AF4
|
||||
|
||||
thumb_func_start sub_02031B00
|
||||
sub_02031B00: ; 0x02031B00
|
||||
ldr r3, _02031B08 ; =SavArray_get
|
||||
mov r1, #0x1d
|
||||
bx r3
|
||||
nop
|
||||
_02031B08: .word SavArray_get
|
||||
thumb_func_end sub_02031B00
|
||||
@ -1227,8 +1227,8 @@ _02051018: .word sub_0205298C
|
||||
_0205101C: .word std_bug_contest_balls_up
|
||||
thumb_func_end sub_02050EB8
|
||||
|
||||
thumb_func_start sub_02051020
|
||||
sub_02051020: ; 0x02051020
|
||||
thumb_func_start SetupAndStartWildBattle
|
||||
SetupAndStartWildBattle: ; 0x02051020
|
||||
push {r4, r5, r6, r7, lr}
|
||||
sub sp, #0xc
|
||||
str r0, [sp, #4]
|
||||
@ -1277,7 +1277,7 @@ _02051062:
|
||||
add sp, #0xc
|
||||
pop {r4, r5, r6, r7, pc}
|
||||
.balign 4, 0
|
||||
thumb_func_end sub_02051020
|
||||
thumb_func_end SetupAndStartWildBattle
|
||||
|
||||
thumb_func_start sub_02051090
|
||||
sub_02051090: ; 0x02051090
|
||||
@ -1604,8 +1604,8 @@ _0205132E:
|
||||
.balign 4, 0
|
||||
thumb_func_end sub_0205128C
|
||||
|
||||
thumb_func_start sub_02051334
|
||||
sub_02051334: ; 0x02051334
|
||||
thumb_func_start SetupAndStartTutorialBattle
|
||||
SetupAndStartTutorialBattle: ; 0x02051334
|
||||
push {r4, r5, r6, lr}
|
||||
add r5, r0, #0
|
||||
bl TaskManager_GetSys
|
||||
@ -1629,7 +1629,7 @@ sub_02051334: ; 0x02051334
|
||||
pop {r4, r5, r6, pc}
|
||||
nop
|
||||
_0205136C: .word sub_0205128C
|
||||
thumb_func_end sub_02051334
|
||||
thumb_func_end SetupAndStartTutorialBattle
|
||||
|
||||
thumb_func_start SetupAndStartTrainerBattle
|
||||
SetupAndStartTrainerBattle: ; 0x02051370
|
||||
|
||||
@ -1889,9 +1889,9 @@ _02053DAA:
|
||||
add r0, r5, #0
|
||||
bl FollowingPokemon_GetMapObject
|
||||
add r7, r0, #0
|
||||
bl sub_02069F7C
|
||||
bl FollowPokeObj_GetSpecies
|
||||
ldr r1, [r6]
|
||||
bl sub_02069FF4
|
||||
bl GetFollowPokePermissionBySpeciesAndMap
|
||||
cmp r0, #0
|
||||
beq _02053DE6
|
||||
add r0, r7, #0
|
||||
|
||||
@ -331,9 +331,9 @@ _02055E20:
|
||||
add r0, r5, #0
|
||||
bl FollowingPokemon_GetMapObject
|
||||
add r5, r0, #0
|
||||
bl sub_02069F7C
|
||||
bl FollowPokeObj_GetSpecies
|
||||
ldr r1, [r4, #4]
|
||||
bl sub_02069FF4
|
||||
bl GetFollowPokePermissionBySpeciesAndMap
|
||||
cmp r0, #0
|
||||
bne _02055E5E
|
||||
add r0, r5, #0
|
||||
|
||||
@ -1,192 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "global.inc"
|
||||
|
||||
.rodata
|
||||
|
||||
_020FCA24:
|
||||
.byte 0x00, 0x01, 0x02, 0x03
|
||||
.byte 0x01, 0x06, 0x07, 0x00
|
||||
.byte 0x02, 0x03, 0x04, 0x05
|
||||
.byte 0x03, 0x00, 0x05, 0x06
|
||||
.byte 0x04, 0x01, 0x02, 0x07
|
||||
.byte 0x05, 0x02, 0x07, 0x00
|
||||
.byte 0x06, 0x03, 0x04, 0x01
|
||||
.byte 0x07, 0x04, 0x05, 0x06
|
||||
_020FCA44:
|
||||
.byte 0x03, 0x3C, 0x3C
|
||||
.byte 0x05, 0x06, 0x06
|
||||
.byte 0x0B, 0x18, 0x18
|
||||
.byte 0x1F, 0x39, 0x39
|
||||
.byte 0x32, 0x30, 0x30
|
||||
.byte 0x33, 0x0E, 0x0E
|
||||
.byte 0x3E, 0x20, 0x20
|
||||
.byte 0x46, 0x31, 0x31
|
||||
|
||||
.byte 0x06, 0x03, 0x03
|
||||
.byte 0x07, 0x0A, 0x0A
|
||||
.byte 0x0D, 0x24, 0x24
|
||||
.byte 0x0E, 0x19, 0x19
|
||||
.byte 0x23, 0x55, 0x55
|
||||
.byte 0x25, 0x23, 0x23
|
||||
.byte 0x2A, 0x12, 0x12
|
||||
.byte 0x3F, 0x21, 0x21
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_0205B3DC
|
||||
sub_0205B3DC: ; 0x0205B3DC
|
||||
push {r3, r4, r5, r6, r7, lr}
|
||||
add r7, r2, #0
|
||||
lsl r0, r0, #0x1d
|
||||
ldr r2, _0205B410 ; =_020FCA24
|
||||
lsr r0, r0, #0x1b
|
||||
add r5, r2, r0
|
||||
lsl r2, r1, #3
|
||||
lsl r1, r2, #1
|
||||
ldr r0, _0205B414 ; =_020FCA44
|
||||
add r1, r2, r1
|
||||
mov r4, #0
|
||||
add r6, r0, r1
|
||||
_0205B3F4:
|
||||
ldrb r3, [r5]
|
||||
add r0, r7, #0
|
||||
add r1, r4, #0
|
||||
lsl r2, r3, #1
|
||||
add r2, r3, r2
|
||||
add r2, r6, r2
|
||||
ldrb r2, [r2, #1]
|
||||
bl BufferTrainerClassName
|
||||
add r4, r4, #1
|
||||
add r5, r5, #1
|
||||
cmp r4, #4
|
||||
blt _0205B3F4
|
||||
pop {r3, r4, r5, r6, r7, pc}
|
||||
.balign 4, 0
|
||||
_0205B410: .word _020FCA24
|
||||
_0205B414: .word _020FCA44
|
||||
thumb_func_end sub_0205B3DC
|
||||
|
||||
thumb_func_start sub_0205B418
|
||||
sub_0205B418: ; 0x0205B418
|
||||
lsl r0, r0, #0x1d
|
||||
lsr r3, r0, #0x1b
|
||||
ldr r0, _0205B430 ; =_020FCA24
|
||||
add r0, r0, r3
|
||||
ldrb r2, [r2, r0]
|
||||
lsl r0, r1, #3
|
||||
add r1, r2, r0
|
||||
lsl r0, r1, #1
|
||||
add r1, r1, r0
|
||||
ldr r0, _0205B434 ; =_020FCA44
|
||||
ldrb r0, [r0, r1]
|
||||
bx lr
|
||||
.balign 4, 0
|
||||
_0205B430: .word _020FCA24
|
||||
_0205B434: .word _020FCA44
|
||||
thumb_func_end sub_0205B418
|
||||
|
||||
thumb_func_start sub_0205B438
|
||||
sub_0205B438: ; 0x0205B438
|
||||
push {r3, r4}
|
||||
lsl r4, r0, #3
|
||||
lsl r0, r4, #1
|
||||
ldr r2, _0205B460 ; =_020FCA44
|
||||
add r0, r4, r0
|
||||
mov r3, #0
|
||||
add r2, r2, r0
|
||||
_0205B446:
|
||||
ldrb r0, [r2]
|
||||
cmp r1, r0
|
||||
bne _0205B452
|
||||
add r0, r3, r4
|
||||
pop {r3, r4}
|
||||
bx lr
|
||||
_0205B452:
|
||||
add r3, r3, #1
|
||||
add r2, r2, #3
|
||||
cmp r3, #8
|
||||
blt _0205B446
|
||||
mov r0, #0
|
||||
pop {r3, r4}
|
||||
bx lr
|
||||
.balign 4, 0
|
||||
_0205B460: .word _020FCA44
|
||||
thumb_func_end sub_0205B438
|
||||
|
||||
thumb_func_start sub_0205B464
|
||||
sub_0205B464: ; 0x0205B464
|
||||
ldr r3, _0205B468 ; =sub_0205B438
|
||||
bx r3
|
||||
.balign 4, 0
|
||||
_0205B468: .word sub_0205B438
|
||||
thumb_func_end sub_0205B464
|
||||
|
||||
thumb_func_start sub_0205B46C
|
||||
sub_0205B46C: ; 0x0205B46C
|
||||
push {r4, lr}
|
||||
add r4, r2, #0
|
||||
bl sub_0205B438
|
||||
cmp r4, #0
|
||||
beq _0205B49A
|
||||
cmp r4, #1
|
||||
beq _0205B48A
|
||||
cmp r4, #2
|
||||
bne _0205B494
|
||||
lsl r1, r0, #1
|
||||
add r1, r0, r1
|
||||
ldr r0, _0205B49C ; =_020FCA44 + 1
|
||||
ldrb r0, [r0, r1]
|
||||
pop {r4, pc}
|
||||
_0205B48A:
|
||||
lsl r1, r0, #1
|
||||
add r1, r0, r1
|
||||
ldr r0, _0205B4A0 ; =_020FCA44 + 2
|
||||
ldrb r0, [r0, r1]
|
||||
pop {r4, pc}
|
||||
_0205B494:
|
||||
bl GF_AssertFail
|
||||
mov r0, #0
|
||||
_0205B49A:
|
||||
pop {r4, pc}
|
||||
.balign 4, 0
|
||||
_0205B49C: .word _020FCA44 + 1
|
||||
_0205B4A0: .word _020FCA44 + 2
|
||||
thumb_func_end sub_0205B46C
|
||||
|
||||
thumb_func_start sub_0205B4A4
|
||||
sub_0205B4A4: ; 0x0205B4A4
|
||||
push {r3, r4, r5, r6, lr}
|
||||
sub sp, #4
|
||||
add r5, r0, #0
|
||||
mov r0, #0x54
|
||||
mov r1, #0xb
|
||||
add r2, sp, #0
|
||||
add r3, r5, #0
|
||||
bl GfGfxLoader_GetPlttData
|
||||
mov r1, #9
|
||||
add r4, r0, #0
|
||||
add r0, r5, #0
|
||||
lsl r1, r1, #6
|
||||
bl AllocFromHeap
|
||||
add r5, r0, #0
|
||||
ldr r0, [sp]
|
||||
mov r2, #0
|
||||
ldr r3, [r0, #0xc]
|
||||
mov r0, #1
|
||||
add r6, r5, #0
|
||||
lsl r0, r0, #8
|
||||
_0205B4D0:
|
||||
ldrh r1, [r3]
|
||||
add r2, r2, #1
|
||||
add r3, r3, #2
|
||||
strh r1, [r6]
|
||||
add r6, r6, #2
|
||||
cmp r2, r0
|
||||
blt _0205B4D0
|
||||
add r0, r4, #0
|
||||
bl FreeToHeap
|
||||
add r0, r5, #0
|
||||
add sp, #4
|
||||
pop {r3, r4, r5, r6, pc}
|
||||
.balign 4, 0
|
||||
thumb_func_end sub_0205B4A4
|
||||
@ -182,15 +182,15 @@ sub_020659CC: ; 0x020659CC
|
||||
mov r1, #0
|
||||
add r0, r4, #0
|
||||
strb r1, [r6]
|
||||
add r0, #0xe8
|
||||
add r0, #0xe8 ; ->followMon.unk4
|
||||
str r1, [r0]
|
||||
mov r0, #1
|
||||
lsl r0, r0, #8
|
||||
lsl r0, r0, #8 ; ->followMon.unk1C
|
||||
str r1, [r4, r0]
|
||||
add r0, r4, #0
|
||||
add r0, #0xec
|
||||
add r0, #0xec ; ->followMon.unk8
|
||||
str r1, [r0]
|
||||
add r4, #0xf0
|
||||
add r4, #0xf0 ; ->followMon.unkC
|
||||
add r0, r5, #0
|
||||
str r1, [r4]
|
||||
bl MapObject_GetCurrentX
|
||||
|
||||
@ -475,7 +475,7 @@ _02067CAE:
|
||||
ldr r0, [r5, r0]
|
||||
mov r1, #1
|
||||
mov r6, #2
|
||||
bl sub_0206A1F4
|
||||
bl FsysUnkSub108_AddMonMood
|
||||
b _02067CD6
|
||||
_02067CD4:
|
||||
mov r6, #1
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "global.inc"
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_02068F84
|
||||
sub_02068F84: ; 0x02068F84
|
||||
push {r4, lr}
|
||||
add r4, r2, #0
|
||||
bl ReadMsgDataIntoString
|
||||
mov r0, #0
|
||||
add r1, r4, #0
|
||||
add r2, r0, #0
|
||||
bl sub_02002F30
|
||||
pop {r4, pc}
|
||||
thumb_func_end sub_02068F84
|
||||
|
||||
thumb_func_start sub_02068F98
|
||||
sub_02068F98: ; 0x02068F98
|
||||
push {r4, r5, r6, lr}
|
||||
add r3, r1, #0
|
||||
mov r1, #0x1b
|
||||
add r6, r2, #0
|
||||
add r2, r1, #0
|
||||
add r5, r0, #0
|
||||
mov r0, #1
|
||||
add r2, #0xfc
|
||||
bl NewMsgDataFromNarc
|
||||
add r4, r0, #0
|
||||
add r0, r5, #0
|
||||
bl MapHeader_GetMapSec
|
||||
add r1, r0, #0
|
||||
add r0, r4, #0
|
||||
add r2, r6, #0
|
||||
bl sub_02068F84
|
||||
add r0, r4, #0
|
||||
bl DestroyMsgData
|
||||
pop {r4, r5, r6, pc}
|
||||
.balign 4, 0
|
||||
thumb_func_end sub_02068F98
|
||||
@ -1,524 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "global.inc"
|
||||
|
||||
.rodata
|
||||
|
||||
_020FFC10:
|
||||
.byte 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x00, 0x01, 0x02, 0x02
|
||||
.byte 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02
|
||||
.byte 0x02, 0x02, 0x02, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02
|
||||
.byte 0x02, 0x02, 0x00, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02
|
||||
.byte 0x02, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01
|
||||
.byte 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, 0x01, 0x00, 0x02
|
||||
.byte 0x02, 0x00, 0x00, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02
|
||||
.byte 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x01, 0x02
|
||||
.byte 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01
|
||||
.byte 0x01, 0x01, 0x00, 0x00, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x02, 0x02
|
||||
.byte 0x00, 0x00, 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01
|
||||
.byte 0x01, 0x01, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 0x00, 0x02, 0x01, 0x01, 0x01
|
||||
.byte 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x02
|
||||
.byte 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x01, 0x02, 0x00, 0x00, 0x02, 0x02, 0x02
|
||||
.byte 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x02, 0x00, 0x00
|
||||
.byte 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00
|
||||
.byte 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00
|
||||
.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x01, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x00
|
||||
.byte 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02
|
||||
.byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x00
|
||||
.byte 0x02, 0x00, 0x02, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02
|
||||
.byte 0x02, 0x01, 0x01, 0x00, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01
|
||||
.byte 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x00, 0x02, 0x02, 0x00, 0x01, 0x00, 0x02, 0x02, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x02
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01
|
||||
.byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00
|
||||
_020FFE2B:
|
||||
.byte 0x00, 0x00, 0x00
|
||||
_020FFE2E:
|
||||
.byte 0x00, 0x01
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_02074170
|
||||
sub_02074170: ; 0x02074170
|
||||
push {r3, r4, r5, r6, r7, lr}
|
||||
add r5, r0, #0
|
||||
bl AcquireBoxMonLock
|
||||
add r7, r0, #0
|
||||
add r0, r5, #0
|
||||
mov r1, #5
|
||||
mov r2, #0
|
||||
bl GetBoxMonData
|
||||
add r4, r0, #0
|
||||
add r0, r5, #0
|
||||
mov r1, #0x4c
|
||||
mov r2, #0
|
||||
bl GetBoxMonData
|
||||
add r6, r0, #0
|
||||
add r0, r5, #0
|
||||
bl sub_020742CC
|
||||
add r2, r0, #0
|
||||
add r0, r4, #0
|
||||
add r1, r6, #0
|
||||
bl sub_020741BC
|
||||
add r4, r0, #0
|
||||
add r0, r5, #0
|
||||
add r1, r7, #0
|
||||
bl ReleaseBoxMonLock
|
||||
add r0, r4, #0
|
||||
pop {r3, r4, r5, r6, r7, pc}
|
||||
thumb_func_end sub_02074170
|
||||
|
||||
thumb_func_start sub_020741B0
|
||||
sub_020741B0: ; 0x020741B0
|
||||
push {r3, lr}
|
||||
bl Mon_GetBoxMon
|
||||
bl sub_02074170
|
||||
pop {r3, pc}
|
||||
thumb_func_end sub_020741B0
|
||||
|
||||
thumb_func_start sub_020741BC
|
||||
sub_020741BC: ; 0x020741BC
|
||||
push {r4, lr}
|
||||
add r4, r0, #0
|
||||
cmp r1, #1
|
||||
bne _020741D2
|
||||
ldr r0, _02074268 ; =0x000001EA
|
||||
cmp r4, r0
|
||||
bne _020741CE
|
||||
add r0, #0xc
|
||||
pop {r4, pc}
|
||||
_020741CE:
|
||||
add r0, #0xb
|
||||
pop {r4, pc}
|
||||
_020741D2:
|
||||
lsl r0, r4, #0x10
|
||||
lsl r1, r2, #0x18
|
||||
lsr r0, r0, #0x10
|
||||
lsr r1, r1, #0x18
|
||||
bl sub_02070438
|
||||
cmp r0, #0
|
||||
beq _0207425A
|
||||
ldr r1, _0207426C ; =0x00000182
|
||||
cmp r4, r1
|
||||
bne _020741EE
|
||||
add r1, #0x74
|
||||
add r0, r0, r1
|
||||
pop {r4, pc}
|
||||
_020741EE:
|
||||
cmp r4, #0xc9
|
||||
bne _020741F8
|
||||
add r1, #0x78
|
||||
add r0, r0, r1
|
||||
pop {r4, pc}
|
||||
_020741F8:
|
||||
add r2, r1, #0
|
||||
add r2, #0x1a
|
||||
cmp r4, r2
|
||||
bne _02074206
|
||||
add r1, #0x93
|
||||
add r0, r0, r1
|
||||
pop {r4, pc}
|
||||
_02074206:
|
||||
add r2, r1, #0
|
||||
add r2, #0x1b
|
||||
cmp r4, r2
|
||||
bne _02074214
|
||||
add r1, #0x95
|
||||
add r0, r0, r1
|
||||
pop {r4, pc}
|
||||
_02074214:
|
||||
add r2, r1, #0
|
||||
add r2, #0x24
|
||||
cmp r4, r2
|
||||
bne _02074222
|
||||
add r1, #0x97
|
||||
add r0, r0, r1
|
||||
pop {r4, pc}
|
||||
_02074222:
|
||||
add r2, r1, #0
|
||||
add r2, #0x25
|
||||
cmp r4, r2
|
||||
bne _02074230
|
||||
add r1, #0x98
|
||||
add r0, r0, r1
|
||||
pop {r4, pc}
|
||||
_02074230:
|
||||
add r2, r1, #0
|
||||
add r2, #0x65
|
||||
cmp r4, r2
|
||||
bne _0207423E
|
||||
add r1, #0x99
|
||||
add r0, r0, r1
|
||||
pop {r4, pc}
|
||||
_0207423E:
|
||||
add r2, r1, #0
|
||||
add r2, #0x6a
|
||||
cmp r4, r2
|
||||
bne _0207424C
|
||||
add r1, #0x9a
|
||||
add r0, r0, r1
|
||||
pop {r4, pc}
|
||||
_0207424C:
|
||||
add r2, r1, #0
|
||||
add r2, #0x5d
|
||||
cmp r4, r2
|
||||
bne _0207425A
|
||||
add r1, #0x9b
|
||||
add r0, r0, r1
|
||||
pop {r4, pc}
|
||||
_0207425A:
|
||||
ldr r0, _02074270 ; =0x000001ED
|
||||
cmp r4, r0
|
||||
bls _02074262
|
||||
mov r4, #0
|
||||
_02074262:
|
||||
add r0, r4, #7
|
||||
pop {r4, pc}
|
||||
nop
|
||||
_02074268: .word 0x000001EA
|
||||
_0207426C: .word 0x00000182
|
||||
_02074270: .word 0x000001ED
|
||||
thumb_func_end sub_020741BC
|
||||
|
||||
thumb_func_start sub_02074274
|
||||
sub_02074274: ; 0x02074274
|
||||
push {r3, r4, r5, lr}
|
||||
add r5, r0, #0
|
||||
add r4, r1, #0
|
||||
bne _020742B4
|
||||
ldr r0, _020742C0 ; =0x0000015F
|
||||
cmp r5, r0
|
||||
bne _02074298
|
||||
lsl r0, r5, #0x10
|
||||
lsl r1, r2, #0x18
|
||||
lsr r0, r0, #0x10
|
||||
lsr r1, r1, #0x18
|
||||
bl sub_02070438
|
||||
add r2, r0, #0
|
||||
beq _020742B4
|
||||
ldr r0, _020742C4 ; =0x00000222
|
||||
add r0, r2, r0
|
||||
pop {r3, r4, r5, pc}
|
||||
_02074298:
|
||||
add r0, #0x46
|
||||
cmp r5, r0
|
||||
bne _020742B4
|
||||
lsl r0, r5, #0x10
|
||||
lsl r1, r2, #0x18
|
||||
lsr r0, r0, #0x10
|
||||
lsr r1, r1, #0x18
|
||||
bl sub_02070438
|
||||
add r2, r0, #0
|
||||
beq _020742B4
|
||||
ldr r0, _020742C8 ; =0x00000225
|
||||
add r0, r2, r0
|
||||
pop {r3, r4, r5, pc}
|
||||
_020742B4:
|
||||
add r0, r5, #0
|
||||
add r1, r4, #0
|
||||
bl sub_020741BC
|
||||
pop {r3, r4, r5, pc}
|
||||
nop
|
||||
_020742C0: .word 0x0000015F
|
||||
_020742C4: .word 0x00000222
|
||||
_020742C8: .word 0x00000225
|
||||
thumb_func_end sub_02074274
|
||||
|
||||
thumb_func_start sub_020742CC
|
||||
sub_020742CC: ; 0x020742CC
|
||||
push {r4, lr}
|
||||
mov r1, #0xae
|
||||
mov r2, #0
|
||||
add r4, r0, #0
|
||||
bl GetBoxMonData
|
||||
ldr r1, _02074360 ; =0x000001A6
|
||||
cmp r0, r1
|
||||
bhi _02074314
|
||||
bhs _0207434C
|
||||
add r2, r1, #0
|
||||
sub r2, #0x24
|
||||
cmp r0, r2
|
||||
bhi _020742F4
|
||||
sub r1, #0x24
|
||||
cmp r0, r1
|
||||
bhs _0207434C
|
||||
cmp r0, #0xc9
|
||||
beq _02074344
|
||||
b _0207435C
|
||||
_020742F4:
|
||||
add r2, r1, #0
|
||||
sub r2, #9
|
||||
cmp r0, r2
|
||||
bhi _0207435C
|
||||
add r2, r1, #0
|
||||
sub r2, #0xa
|
||||
cmp r0, r2
|
||||
blo _0207435C
|
||||
add r2, r1, #0
|
||||
sub r2, #0xa
|
||||
cmp r0, r2
|
||||
beq _0207434C
|
||||
sub r1, #9
|
||||
cmp r0, r1
|
||||
beq _0207434C
|
||||
b _0207435C
|
||||
_02074314:
|
||||
add r2, r1, #0
|
||||
add r2, #0x39
|
||||
cmp r0, r2
|
||||
bhi _0207432C
|
||||
add r2, r1, #0
|
||||
add r2, #0x39
|
||||
cmp r0, r2
|
||||
bhs _0207434C
|
||||
add r1, r1, #1
|
||||
cmp r0, r1
|
||||
beq _0207434C
|
||||
b _0207435C
|
||||
_0207432C:
|
||||
add r2, r1, #0
|
||||
add r2, #0x41
|
||||
cmp r0, r2
|
||||
bhi _0207433C
|
||||
add r1, #0x41
|
||||
cmp r0, r1
|
||||
beq _0207434C
|
||||
b _0207435C
|
||||
_0207433C:
|
||||
add r1, #0x46
|
||||
cmp r0, r1
|
||||
beq _0207434C
|
||||
b _0207435C
|
||||
_02074344:
|
||||
add r0, r4, #0
|
||||
bl GetBoxMonUnownLetter
|
||||
pop {r4, pc}
|
||||
_0207434C:
|
||||
add r0, r4, #0
|
||||
mov r1, #0x70
|
||||
mov r2, #0
|
||||
bl GetBoxMonData
|
||||
lsl r0, r0, #0x10
|
||||
lsr r0, r0, #0x10
|
||||
pop {r4, pc}
|
||||
_0207435C:
|
||||
mov r0, #0
|
||||
pop {r4, pc}
|
||||
.balign 4, 0
|
||||
_02074360: .word 0x000001A6
|
||||
thumb_func_end sub_020742CC
|
||||
|
||||
thumb_func_start sub_02074364
|
||||
sub_02074364: ; 0x02074364
|
||||
cmp r2, #1
|
||||
bne _02074376
|
||||
ldr r1, _02074400 ; =0x000001EA
|
||||
cmp r0, r1
|
||||
bne _02074372
|
||||
add r0, r1, #5
|
||||
b _020743F8
|
||||
_02074372:
|
||||
add r0, r1, #4
|
||||
b _020743F8
|
||||
_02074376:
|
||||
ldr r2, _02074404 ; =0x000001ED
|
||||
cmp r0, r2
|
||||
bls _02074380
|
||||
mov r0, #0
|
||||
b _020743F8
|
||||
_02074380:
|
||||
cmp r1, #0
|
||||
beq _020743F8
|
||||
add r3, r2, #0
|
||||
sub r3, #0x6b
|
||||
cmp r0, r3
|
||||
bne _02074392
|
||||
add r0, r2, #2
|
||||
add r0, r1, r0
|
||||
b _020743F8
|
||||
_02074392:
|
||||
cmp r0, #0xc9
|
||||
bne _0207439C
|
||||
add r0, r2, #5
|
||||
add r0, r1, r0
|
||||
b _020743F8
|
||||
_0207439C:
|
||||
add r3, r2, #0
|
||||
sub r3, #0x51
|
||||
cmp r0, r3
|
||||
bne _020743AA
|
||||
add r2, #0x21
|
||||
add r0, r1, r2
|
||||
b _020743F8
|
||||
_020743AA:
|
||||
add r3, r2, #0
|
||||
sub r3, #0x50
|
||||
cmp r0, r3
|
||||
bne _020743B8
|
||||
add r2, #0x23
|
||||
add r0, r1, r2
|
||||
b _020743F8
|
||||
_020743B8:
|
||||
add r3, r2, #0
|
||||
sub r3, #0x47
|
||||
cmp r0, r3
|
||||
bne _020743C6
|
||||
add r2, #0x25
|
||||
add r0, r1, r2
|
||||
b _020743F8
|
||||
_020743C6:
|
||||
add r3, r2, #0
|
||||
sub r3, #0x46
|
||||
cmp r0, r3
|
||||
bne _020743D4
|
||||
add r2, #0x26
|
||||
add r0, r1, r2
|
||||
b _020743F8
|
||||
_020743D4:
|
||||
sub r3, r2, #6
|
||||
cmp r0, r3
|
||||
bne _020743E0
|
||||
add r2, #0x27
|
||||
add r0, r1, r2
|
||||
b _020743F8
|
||||
_020743E0:
|
||||
sub r3, r2, #1
|
||||
cmp r0, r3
|
||||
bne _020743EC
|
||||
add r2, #0x28
|
||||
add r0, r1, r2
|
||||
b _020743F8
|
||||
_020743EC:
|
||||
add r3, r2, #0
|
||||
sub r3, #0xe
|
||||
cmp r0, r3
|
||||
bne _020743F8
|
||||
add r2, #0x29
|
||||
add r0, r1, r2
|
||||
_020743F8:
|
||||
ldr r1, _02074408 ; =_020FFC10
|
||||
ldrb r0, [r1, r0]
|
||||
bx lr
|
||||
nop
|
||||
_02074400: .word 0x000001EA
|
||||
_02074404: .word 0x000001ED
|
||||
_02074408: .word _020FFC10
|
||||
thumb_func_end sub_02074364
|
||||
|
||||
thumb_func_start sub_0207440C
|
||||
sub_0207440C: ; 0x0207440C
|
||||
push {r3, lr}
|
||||
cmp r2, #0
|
||||
bne _02074432
|
||||
ldr r3, _02074438 ; =0x0000015F
|
||||
cmp r0, r3
|
||||
bne _02074422
|
||||
cmp r1, #0
|
||||
beq _02074432
|
||||
ldr r0, _0207443C ; =_020FFE2B
|
||||
ldrb r0, [r0, r1]
|
||||
pop {r3, pc}
|
||||
_02074422:
|
||||
add r3, #0x46
|
||||
cmp r0, r3
|
||||
bne _02074432
|
||||
cmp r1, #0
|
||||
beq _02074432
|
||||
ldr r0, _02074440 ; =_020FFE2E
|
||||
ldrb r0, [r0, r1]
|
||||
pop {r3, pc}
|
||||
_02074432:
|
||||
bl sub_02074364
|
||||
pop {r3, pc}
|
||||
.balign 4, 0
|
||||
_02074438: .word 0x0000015F
|
||||
_0207443C: .word _020FFE2B
|
||||
_02074440: .word _020FFE2E
|
||||
thumb_func_end sub_0207440C
|
||||
|
||||
thumb_func_start sub_02074444
|
||||
sub_02074444: ; 0x02074444
|
||||
push {r3, r4, r5, r6, r7, lr}
|
||||
add r5, r0, #0
|
||||
bl AcquireBoxMonLock
|
||||
add r4, r0, #0
|
||||
add r0, r5, #0
|
||||
bl sub_020742CC
|
||||
add r6, r0, #0
|
||||
add r0, r5, #0
|
||||
mov r1, #5
|
||||
mov r2, #0
|
||||
bl GetBoxMonData
|
||||
add r7, r0, #0
|
||||
add r0, r5, #0
|
||||
mov r1, #0x4c
|
||||
mov r2, #0
|
||||
bl GetBoxMonData
|
||||
str r0, [sp]
|
||||
add r0, r5, #0
|
||||
add r1, r4, #0
|
||||
bl ReleaseBoxMonLock
|
||||
ldr r2, [sp]
|
||||
add r0, r7, #0
|
||||
add r1, r6, #0
|
||||
bl sub_02074364
|
||||
pop {r3, r4, r5, r6, r7, pc}
|
||||
.balign 4, 0
|
||||
thumb_func_end sub_02074444
|
||||
|
||||
thumb_func_start sub_02074484
|
||||
sub_02074484: ; 0x02074484
|
||||
push {r3, lr}
|
||||
bl Mon_GetBoxMon
|
||||
bl sub_02074444
|
||||
pop {r3, pc}
|
||||
thumb_func_end sub_02074484
|
||||
|
||||
thumb_func_start sub_02074490
|
||||
sub_02074490: ; 0x02074490
|
||||
mov r0, #0
|
||||
bx lr
|
||||
thumb_func_end sub_02074490
|
||||
|
||||
thumb_func_start sub_02074494
|
||||
sub_02074494: ; 0x02074494
|
||||
mov r0, #2
|
||||
bx lr
|
||||
thumb_func_end sub_02074494
|
||||
|
||||
thumb_func_start sub_02074498
|
||||
sub_02074498: ; 0x02074498
|
||||
mov r0, #4
|
||||
bx lr
|
||||
thumb_func_end sub_02074498
|
||||
|
||||
thumb_func_start sub_0207449C
|
||||
sub_0207449C: ; 0x0207449C
|
||||
mov r0, #6
|
||||
bx lr
|
||||
thumb_func_end sub_0207449C
|
||||
|
||||
thumb_func_start sub_020744A0
|
||||
sub_020744A0: ; 0x020744A0
|
||||
mov r0, #1
|
||||
bx lr
|
||||
thumb_func_end sub_020744A0
|
||||
|
||||
thumb_func_start sub_020744A4
|
||||
sub_020744A4: ; 0x020744A4
|
||||
mov r0, #3
|
||||
bx lr
|
||||
thumb_func_end sub_020744A4
|
||||
|
||||
thumb_func_start sub_020744A8
|
||||
sub_020744A8: ; 0x020744A8
|
||||
mov r0, #5
|
||||
bx lr
|
||||
thumb_func_end sub_020744A8
|
||||
@ -998,7 +998,7 @@ sub_02075D4C: ; 0x02075D4C
|
||||
ldr r0, [r4, #0x44]
|
||||
bl sub_02016F2C
|
||||
ldr r0, [r4, #0x34]
|
||||
bl sub_02026F54
|
||||
bl GF_3DVramMan_Delete
|
||||
ldr r0, [r4]
|
||||
bl sub_020771A0
|
||||
ldr r0, [r4, #8]
|
||||
|
||||
@ -59,7 +59,7 @@ sub_02077400: ; 0x02077400
|
||||
str r1, [sp, #4]
|
||||
mov r1, #0
|
||||
add r3, r1, #0
|
||||
bl sub_02026EB4
|
||||
bl GF_3DVramMan_Create
|
||||
add sp, #8
|
||||
pop {r3, pc}
|
||||
.balign 4, 0
|
||||
|
||||
@ -1423,7 +1423,7 @@ sub_0207997C: ; 0x0207997C
|
||||
str r1, [sp, #4]
|
||||
mov r1, #0
|
||||
add r3, r1, #0
|
||||
bl sub_02026EB4
|
||||
bl GF_3DVramMan_Create
|
||||
add sp, #8
|
||||
pop {r3, pc}
|
||||
nop
|
||||
@ -1484,10 +1484,10 @@ _02079A08: .word 0x04000580
|
||||
|
||||
thumb_func_start sub_02079A0C
|
||||
sub_02079A0C: ; 0x02079A0C
|
||||
ldr r3, _02079A10 ; =sub_02026F54
|
||||
ldr r3, _02079A10 ; =GF_3DVramMan_Delete
|
||||
bx r3
|
||||
.balign 4, 0
|
||||
_02079A10: .word sub_02026F54
|
||||
_02079A10: .word GF_3DVramMan_Delete
|
||||
thumb_func_end sub_02079A0C
|
||||
|
||||
thumb_func_start sub_02079A14
|
||||
|
||||
@ -127,7 +127,7 @@ sub_0207EBE4: ; 0x0207EBE4
|
||||
str r0, [sp, #0x10]
|
||||
strh r1, [r3, r2]
|
||||
add r7, r7, #4
|
||||
bl sub_020741B0
|
||||
bl Pokemon_GetIconNaix
|
||||
add r3, r0, #0
|
||||
mov r0, #0
|
||||
str r0, [sp]
|
||||
@ -160,7 +160,7 @@ sub_0207EBE4: ; 0x0207EBE4
|
||||
str r0, [sp, #0x18]
|
||||
ldrh r0, [r0, r4]
|
||||
ldrb r1, [r7, r4]
|
||||
bl sub_02074364
|
||||
bl GetMonIconPaletteEx
|
||||
add r0, r0, #3
|
||||
str r0, [sp, #0x2c]
|
||||
mov r0, #1
|
||||
@ -185,7 +185,7 @@ sub_0207EBE4: ; 0x0207EBE4
|
||||
ldrb r1, [r7, r4]
|
||||
ldrh r0, [r0, r4]
|
||||
ldr r2, [sp, #0x14]
|
||||
bl sub_02074364
|
||||
bl GetMonIconPaletteEx
|
||||
add r0, r0, #1
|
||||
str r0, [sp, #0x2c]
|
||||
add r2, sp, #0x1c
|
||||
@ -250,7 +250,7 @@ sub_0207ECE0: ; 0x0207ECE0
|
||||
bl NNS_G2dGetImageLocation
|
||||
str r0, [sp, #0x14]
|
||||
add r0, r7, #0
|
||||
bl sub_020741B0
|
||||
bl Pokemon_GetIconNaix
|
||||
add r1, r0, #0
|
||||
mov r0, #1
|
||||
str r0, [sp]
|
||||
@ -295,7 +295,7 @@ _0207ED8E:
|
||||
ldr r0, [sp, #0xc]
|
||||
ldr r1, [sp, #8]
|
||||
mov r2, #0
|
||||
bl sub_02074364
|
||||
bl GetMonIconPaletteEx
|
||||
add r1, r0, #0
|
||||
ldr r0, [r6, r4]
|
||||
add r1, r1, #3
|
||||
@ -303,7 +303,7 @@ _0207ED8E:
|
||||
ldr r0, [sp, #0xc]
|
||||
ldr r1, [sp, #8]
|
||||
mov r2, #0
|
||||
bl sub_02074364
|
||||
bl GetMonIconPaletteEx
|
||||
add r2, r0, #0
|
||||
mov r0, #0x85
|
||||
add r1, r5, r4
|
||||
|
||||
@ -239,7 +239,7 @@ sub_02082AEC: ; 0x02082AEC
|
||||
add r0, r5, #0
|
||||
add r1, r6, #0
|
||||
mov r2, #0
|
||||
bl sub_02074364
|
||||
bl GetMonIconPaletteEx
|
||||
lsl r0, r0, #5
|
||||
add r0, r4, r0
|
||||
mov r1, #0xc0
|
||||
@ -1915,7 +1915,7 @@ _02083812:
|
||||
ldr r0, [r5, #4]
|
||||
ldr r2, [r5, #8]
|
||||
mov r1, #0
|
||||
bl sub_020741BC
|
||||
bl GetMonIconNaixEx
|
||||
ldr r3, _020839AC ; =0x000004B8
|
||||
add r1, r0, #0
|
||||
mov r0, #0x12
|
||||
|
||||
@ -1587,11 +1587,11 @@ sub_0208BE00: ; 0x0208BE00
|
||||
cmp r0, #2
|
||||
bne _0208BE30
|
||||
add r0, r4, #0
|
||||
bl sub_02074170
|
||||
bl Boxmon_GetIconNaix
|
||||
b _0208BE36
|
||||
_0208BE30:
|
||||
add r0, r4, #0
|
||||
bl sub_020741B0
|
||||
bl Pokemon_GetIconNaix
|
||||
_0208BE36:
|
||||
add r1, r0, #0
|
||||
mov r0, #0x13
|
||||
@ -1639,7 +1639,7 @@ sub_0208BE70: ; 0x0208BE70
|
||||
ldrh r1, [r4, r1]
|
||||
lsl r2, r2, #3
|
||||
lsr r2, r2, #0x1f
|
||||
bl sub_02074364
|
||||
bl GetMonIconPaletteEx
|
||||
add r1, r0, #0
|
||||
mov r0, #0x45
|
||||
lsl r0, r0, #4
|
||||
@ -1714,7 +1714,7 @@ _0208BF1C:
|
||||
add r0, r6, #0
|
||||
bl sub_0208A520
|
||||
add r7, r0, #0
|
||||
bl sub_02074484
|
||||
bl Pokemon_GetIconPalette
|
||||
add r1, r0, #0
|
||||
ldr r0, _0208BF98 ; =0x00000528
|
||||
add r1, #0xc
|
||||
@ -1723,7 +1723,7 @@ _0208BF1C:
|
||||
b _0208BF64
|
||||
_0208BF36:
|
||||
add r0, r7, #0
|
||||
bl sub_02074444
|
||||
bl Boxmon_GetIconPalette
|
||||
add r1, r0, #0
|
||||
ldr r0, _0208BF98 ; =0x00000528
|
||||
add r1, #0xc
|
||||
@ -1735,7 +1735,7 @@ _0208BF4A:
|
||||
add r1, r4, #0
|
||||
bl GetPartyMonByIndex
|
||||
add r7, r0, #0
|
||||
bl sub_02074484
|
||||
bl Pokemon_GetIconPalette
|
||||
add r1, r0, #0
|
||||
ldr r0, _0208BF98 ; =0x00000528
|
||||
add r1, #0xc
|
||||
@ -1829,7 +1829,7 @@ sub_0208BFD0: ; 0x0208BFD0
|
||||
mov r2, #0x49
|
||||
bl sub_0208BE00
|
||||
add r0, r4, #0
|
||||
bl sub_02074444
|
||||
bl Boxmon_GetIconPalette
|
||||
add r1, r0, #0
|
||||
ldr r0, _0208C060 ; =0x00000528
|
||||
add r1, #0xc
|
||||
@ -1849,7 +1849,7 @@ _0208C020:
|
||||
mov r2, #0x4a
|
||||
bl sub_0208BE00
|
||||
add r0, r4, #0
|
||||
bl sub_02074444
|
||||
bl Boxmon_GetIconPalette
|
||||
add r1, r0, #0
|
||||
ldr r0, _0208C064 ; =0x0000052C
|
||||
add r1, #0xc
|
||||
|
||||
@ -112,6 +112,6 @@ sub_02091634: ; 0x02091634
|
||||
|
||||
.rodata
|
||||
|
||||
.public _021065C4
|
||||
_021065C4:
|
||||
.public gApp_MainMenu_SelectOption_NintendoWFCSetup
|
||||
gApp_MainMenu_SelectOption_NintendoWFCSetup:
|
||||
.word sub_02091634, 0, 0, 0xFFFFFFFF
|
||||
|
||||
@ -113,7 +113,7 @@ _02092280: .word 0xFFFFE0FF
|
||||
_02092284: .word 0x04001000
|
||||
thumb_func_end sub_020921E4
|
||||
|
||||
.public ov74_0223B310
|
||||
.public gApp_MainMenu
|
||||
|
||||
thumb_func_start sub_02092288
|
||||
sub_02092288: ; 0x02092288
|
||||
@ -128,13 +128,13 @@ sub_02092288: ; 0x02092288
|
||||
add r0, r4, #0
|
||||
bl DestroyHeap
|
||||
ldr r0, _020922B0 ; =SDK_OVERLAY_OVY_74_ID
|
||||
ldr r1, _020922B4 ; =ov74_0223B310
|
||||
ldr r1, _020922B4 ; =gApp_MainMenu
|
||||
bl RegisterMainOverlay
|
||||
mov r0, #1
|
||||
pop {r3, r4, r5, pc}
|
||||
.balign 4, 0
|
||||
_020922B0: .word SDK_OVERLAY_OVY_74_ID
|
||||
_020922B4: .word ov74_0223B310
|
||||
_020922B4: .word gApp_MainMenu
|
||||
thumb_func_end sub_02092288
|
||||
|
||||
thumb_func_start sub_020922B8
|
||||
|
||||
@ -3142,7 +3142,7 @@ sub_02094C08: ; 0x02094C08
|
||||
ldrh r1, [r6, #8]
|
||||
ldrh r2, [r6, #0xa]
|
||||
ldr r0, [r6]
|
||||
bl sub_020741BC
|
||||
bl GetMonIconNaixEx
|
||||
ldr r2, [sp, #0x18]
|
||||
ldr r3, [sp, #0x1c]
|
||||
add r1, sp, #0
|
||||
@ -3163,7 +3163,7 @@ sub_02094C08: ; 0x02094C08
|
||||
ldrh r1, [r6, #0xa]
|
||||
ldrh r2, [r6, #8]
|
||||
ldr r0, [r6]
|
||||
bl sub_02074364
|
||||
bl GetMonIconPaletteEx
|
||||
add r0, #8
|
||||
str r0, [r4, #4]
|
||||
ldr r1, [r4, #4]
|
||||
|
||||
@ -1,235 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "global.inc"
|
||||
|
||||
.rodata
|
||||
|
||||
_020F6B50:
|
||||
.byte 0x00, 0x03, 0x03, 0x1A, 0x12, 0x01, 0x23, 0x00
|
||||
_020F6B58:
|
||||
.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
_020F6B68:
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x06, 0x00, 0x01, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00
|
||||
_020F6B84:
|
||||
.byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start ShowWFCUserInfoWarning
|
||||
ShowWFCUserInfoWarning: ; 0x0203AC94
|
||||
push {r4, r5, r6, r7, lr}
|
||||
sub sp, #0x24
|
||||
add r4, r0, #0
|
||||
mov r0, #0
|
||||
add r1, r0, #0
|
||||
bl sub_0200FBF4
|
||||
mov r0, #1
|
||||
mov r1, #0
|
||||
bl sub_0200FBF4
|
||||
mov r0, #0
|
||||
add r1, r0, #0
|
||||
bl Main_SetVBlankIntrCB
|
||||
mov r0, #0
|
||||
add r1, r0, #0
|
||||
bl Main_SetHBlankIntrCB
|
||||
bl GX_DisableEngineALayers
|
||||
bl GX_DisableEngineBLayers
|
||||
mov r2, #1
|
||||
lsl r2, r2, #0x1a
|
||||
ldr r1, [r2]
|
||||
ldr r0, _0203AE70 ; =0xFFFFE0FF
|
||||
and r1, r0
|
||||
str r1, [r2]
|
||||
ldr r2, _0203AE74 ; =0x04001000
|
||||
ldr r1, [r2]
|
||||
and r0, r1
|
||||
str r0, [r2]
|
||||
mov r0, #4
|
||||
mov r1, #8
|
||||
bl SetKeyRepeatTimers
|
||||
ldr r0, _0203AE78 ; =gSystem + 0x60
|
||||
mov r1, #0
|
||||
strb r1, [r0, #9]
|
||||
bl GX_SwapDisplay
|
||||
ldr r3, _0203AE7C ; =0x04000050
|
||||
mov r0, #0
|
||||
strh r0, [r3]
|
||||
ldr r2, _0203AE80 ; =0x04001050
|
||||
sub r3, #0x50
|
||||
strh r0, [r2]
|
||||
ldr r1, [r3]
|
||||
ldr r0, _0203AE84 ; =0xFFFF1FFF
|
||||
sub r2, #0x50
|
||||
and r1, r0
|
||||
str r1, [r3]
|
||||
ldr r1, [r2]
|
||||
and r0, r1
|
||||
str r0, [r2]
|
||||
ldr r0, _0203AE88 ; =_020F6B84
|
||||
bl GX_SetBanks
|
||||
add r0, r4, #0
|
||||
bl BgConfig_Alloc
|
||||
str r0, [sp, #0x10]
|
||||
ldr r0, _0203AE8C ; =_020F6B58
|
||||
bl SetBothScreensModesAndDisable
|
||||
mov r1, #0
|
||||
ldr r0, [sp, #0x10]
|
||||
ldr r2, _0203AE90 ; =_020F6B68
|
||||
add r3, r1, #0
|
||||
bl InitBgFromTemplate
|
||||
ldr r0, [sp, #0x10]
|
||||
mov r1, #0
|
||||
bl BgClearTilemapBufferAndCommit
|
||||
mov r1, #0
|
||||
str r1, [sp]
|
||||
ldr r0, [sp, #0x10]
|
||||
ldr r2, _0203AE94 ; =0x000001F7
|
||||
mov r3, #2
|
||||
str r4, [sp, #4]
|
||||
bl sub_0200E3DC
|
||||
mov r0, #0
|
||||
mov r1, #0x20
|
||||
add r2, r4, #0
|
||||
bl sub_02003030
|
||||
mov r0, #0
|
||||
mov r1, #0x20
|
||||
add r2, r0, #0
|
||||
add r3, r4, #0
|
||||
bl BG_ClearCharDataRange
|
||||
ldr r1, _0203AE98 ; =0x00006C21
|
||||
mov r0, #0
|
||||
bl BG_SetMaskColor
|
||||
ldr r1, _0203AE98 ; =0x00006C21
|
||||
mov r0, #4
|
||||
bl BG_SetMaskColor
|
||||
mov r2, #0x32
|
||||
mov r0, #1
|
||||
mov r1, #0x1b
|
||||
lsl r2, r2, #4
|
||||
add r3, r4, #0
|
||||
bl NewMsgDataFromNarc
|
||||
str r0, [sp, #0xc]
|
||||
mov r0, #6
|
||||
lsl r0, r0, #6
|
||||
add r1, r4, #0
|
||||
bl String_ctor
|
||||
add r4, r0, #0
|
||||
bl sub_02020080
|
||||
ldr r0, [sp, #0x10]
|
||||
ldr r2, _0203AE9C ; =_020F6B50
|
||||
add r1, sp, #0x14
|
||||
bl AddWindow
|
||||
mov r0, #0xd0
|
||||
str r0, [sp]
|
||||
mov r0, #0x90
|
||||
mov r2, #0
|
||||
str r0, [sp, #4]
|
||||
add r0, sp, #0x14
|
||||
mov r1, #0xf
|
||||
add r3, r2, #0
|
||||
bl FillWindowPixelRect
|
||||
ldr r2, _0203AE94 ; =0x000001F7
|
||||
add r0, sp, #0x14
|
||||
mov r1, #0
|
||||
mov r3, #2
|
||||
bl DrawFrameAndWindow1
|
||||
ldr r0, [sp, #0xc]
|
||||
mov r1, #0x10
|
||||
add r2, r4, #0
|
||||
bl ReadMsgDataIntoString
|
||||
mov r1, #0
|
||||
str r1, [sp]
|
||||
str r1, [sp, #4]
|
||||
add r0, sp, #0x14
|
||||
add r2, r4, #0
|
||||
add r3, r1, #0
|
||||
str r1, [sp, #8]
|
||||
bl AddTextPrinterParameterized
|
||||
add r0, r4, #0
|
||||
bl String_dtor
|
||||
bl GX_BothDispOn
|
||||
mov r0, #0
|
||||
bl SetMasterBrightnessNeutral
|
||||
mov r0, #1
|
||||
bl SetMasterBrightnessNeutral
|
||||
mov r0, #0
|
||||
mov r1, #0x3f
|
||||
mov r2, #3
|
||||
bl SetBlendBrightness
|
||||
ldr r4, _0203AEA0 ; =0x04000130
|
||||
ldr r6, _0203AEA4 ; =0x027FFFA8
|
||||
mov r7, #1
|
||||
_0203ADEE:
|
||||
ldrh r1, [r4]
|
||||
ldrh r0, [r6]
|
||||
orr r1, r0
|
||||
ldr r0, _0203AEA8 ; =0x00002FFF
|
||||
eor r1, r0
|
||||
and r0, r1
|
||||
lsl r0, r0, #0x10
|
||||
lsr r5, r0, #0x10
|
||||
bl HandleDSLidAction
|
||||
add r0, r5, #0
|
||||
tst r0, r7
|
||||
bne _0203AE12
|
||||
mov r0, #1
|
||||
add r1, r0, #0
|
||||
bl OS_WaitIrq
|
||||
b _0203ADEE
|
||||
_0203AE12:
|
||||
add r0, sp, #0x14
|
||||
bl RemoveWindow
|
||||
ldr r0, [sp, #0xc]
|
||||
bl DestroyMsgData
|
||||
mov r0, #0
|
||||
add r1, r0, #0
|
||||
bl ToggleBgLayer
|
||||
mov r0, #1
|
||||
mov r1, #0
|
||||
bl ToggleBgLayer
|
||||
mov r0, #2
|
||||
mov r1, #0
|
||||
bl ToggleBgLayer
|
||||
mov r0, #3
|
||||
mov r1, #0
|
||||
bl ToggleBgLayer
|
||||
mov r0, #4
|
||||
mov r1, #0
|
||||
bl ToggleBgLayer
|
||||
mov r0, #5
|
||||
mov r1, #0
|
||||
bl ToggleBgLayer
|
||||
mov r0, #6
|
||||
mov r1, #0
|
||||
bl ToggleBgLayer
|
||||
mov r0, #7
|
||||
mov r1, #0
|
||||
bl ToggleBgLayer
|
||||
ldr r0, [sp, #0x10]
|
||||
mov r1, #0
|
||||
bl FreeBgTilemapBuffer
|
||||
ldr r0, [sp, #0x10]
|
||||
bl FreeToHeap
|
||||
add sp, #0x24
|
||||
pop {r4, r5, r6, r7, pc}
|
||||
.balign 4, 0
|
||||
_0203AE70: .word 0xFFFFE0FF
|
||||
_0203AE74: .word 0x04001000
|
||||
_0203AE78: .word gSystem + 0x60
|
||||
_0203AE7C: .word 0x04000050
|
||||
_0203AE80: .word 0x04001050
|
||||
_0203AE84: .word 0xFFFF1FFF
|
||||
_0203AE88: .word _020F6B84
|
||||
_0203AE8C: .word _020F6B58
|
||||
_0203AE90: .word _020F6B68
|
||||
_0203AE94: .word 0x000001F7
|
||||
_0203AE98: .word 0x00006C21
|
||||
_0203AE9C: .word _020F6B50
|
||||
_0203AEA0: .word 0x04000130
|
||||
_0203AEA4: .word 0x027FFFA8
|
||||
_0203AEA8: .word 0x00002FFF
|
||||
thumb_func_end ShowWFCUserInfoWarning
|
||||
2
files/.gitignore
vendored
2
files/.gitignore
vendored
@ -25,6 +25,7 @@ a/1/3/1
|
||||
a/1/3/3
|
||||
a/1/3/6
|
||||
a/1/3/8
|
||||
a/1/4/1
|
||||
a/1/6/3
|
||||
a/1/6/9
|
||||
a/1/7/2
|
||||
@ -33,6 +34,7 @@ a/1/9/4
|
||||
a/1/9/5
|
||||
a/2/1/2
|
||||
a/2/1/4
|
||||
a/2/2/9
|
||||
a/2/5/2
|
||||
msgdata/msg.narc
|
||||
fielddata/eventdata/zone_event.narc
|
||||
|
||||
@ -104,7 +104,7 @@
|
||||
"ovid": "SPRITE_GSWOMAN2",
|
||||
"mvt": 5,
|
||||
"type": 0,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_2",
|
||||
"scr": "_EV_scr_seq_T25_002 + 1",
|
||||
"dirn": 2,
|
||||
"eye": 0,
|
||||
@ -121,7 +121,7 @@
|
||||
"ovid": "SPRITE_GSOLDMAN1",
|
||||
"mvt": 5,
|
||||
"type": 0,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_2",
|
||||
"scr": "_EV_scr_seq_T25_006 + 1",
|
||||
"dirn": 2,
|
||||
"eye": 0,
|
||||
@ -138,7 +138,7 @@
|
||||
"ovid": "SPRITE_GSBOY1",
|
||||
"mvt": 3,
|
||||
"type": 0,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_2",
|
||||
"scr": "_EV_scr_seq_T25_004 + 1",
|
||||
"dirn": 3,
|
||||
"eye": 0,
|
||||
@ -155,7 +155,7 @@
|
||||
"ovid": "SPRITE_GSBOY1",
|
||||
"mvt": 4,
|
||||
"type": 0,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_2",
|
||||
"scr": "_EV_scr_seq_T25_003 + 1",
|
||||
"dirn": 1,
|
||||
"eye": 0,
|
||||
@ -172,7 +172,7 @@
|
||||
"ovid": "SPRITE_ROCKETM",
|
||||
"mvt": 14,
|
||||
"type": 0,
|
||||
"flag": "FLAG_UNK_1B9",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_3",
|
||||
"scr": "_EV_scr_seq_T25_007 + 1",
|
||||
"dirn": 0,
|
||||
"eye": 0,
|
||||
@ -189,7 +189,7 @@
|
||||
"ovid": "SPRITE_GSMIDDLEMAN1",
|
||||
"mvt": 14,
|
||||
"type": 0,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_2",
|
||||
"scr": "_EV_scr_seq_T25_005 + 1",
|
||||
"dirn": 0,
|
||||
"eye": 0,
|
||||
@ -206,7 +206,7 @@
|
||||
"ovid": "SPRITE_GSWOMAN2",
|
||||
"mvt": 16,
|
||||
"type": 0,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_2",
|
||||
"scr": "_EV_scr_seq_T25_001 + 1",
|
||||
"dirn": 2,
|
||||
"eye": 0,
|
||||
@ -223,7 +223,7 @@
|
||||
"ovid": "SPRITE_GSGIRL1",
|
||||
"mvt": 4,
|
||||
"type": 0,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_2",
|
||||
"scr": "_EV_scr_seq_T25_000 + 1",
|
||||
"dirn": 0,
|
||||
"eye": 0,
|
||||
@ -240,7 +240,7 @@
|
||||
"ovid": "SPRITE_ROCKETM",
|
||||
"mvt": 0,
|
||||
"type": 0,
|
||||
"flag": "FLAG_UNK_1BB",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_5",
|
||||
"scr": "_EV_scr_seq_T25_014 + 1",
|
||||
"dirn": 1,
|
||||
"eye": 0,
|
||||
@ -257,7 +257,7 @@
|
||||
"ovid": "SPRITE_ROCKETM",
|
||||
"mvt": 0,
|
||||
"type": 0,
|
||||
"flag": "FLAG_UNK_1BB",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_5",
|
||||
"scr": "_EV_scr_seq_T25_015 + 1",
|
||||
"dirn": 1,
|
||||
"eye": 0,
|
||||
@ -274,7 +274,7 @@
|
||||
"ovid": "SPRITE_ROCKETM",
|
||||
"mvt": 0,
|
||||
"type": 0,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_1",
|
||||
"scr": "_EV_scr_seq_T25_012 + 1",
|
||||
"dirn": 1,
|
||||
"eye": 0,
|
||||
@ -291,7 +291,7 @@
|
||||
"ovid": "SPRITE_ROCKETM",
|
||||
"mvt": 0,
|
||||
"type": 0,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_1",
|
||||
"scr": "_EV_scr_seq_T25_013 + 1",
|
||||
"dirn": 1,
|
||||
"eye": 0,
|
||||
@ -308,7 +308,7 @@
|
||||
"ovid": "SPRITE_ROCKETM",
|
||||
"mvt": 0,
|
||||
"type": 0,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_1",
|
||||
"scr": "_EV_scr_seq_T25_008 + 1",
|
||||
"dirn": 0,
|
||||
"eye": 0,
|
||||
@ -325,7 +325,7 @@
|
||||
"ovid": "SPRITE_ROCKETM",
|
||||
"mvt": 0,
|
||||
"type": 0,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_1",
|
||||
"scr": "_EV_scr_seq_T25_011 + 1",
|
||||
"dirn": 0,
|
||||
"eye": 0,
|
||||
@ -342,7 +342,7 @@
|
||||
"ovid": "SPRITE_ROCKETM",
|
||||
"mvt": 0,
|
||||
"type": 0,
|
||||
"flag": "FLAG_UNK_1BA",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_4",
|
||||
"scr": "_EV_scr_seq_T25_010 + 1",
|
||||
"dirn": 3,
|
||||
"eye": 0,
|
||||
@ -359,7 +359,7 @@
|
||||
"ovid": "SPRITE_ROCKETM",
|
||||
"mvt": 0,
|
||||
"type": 0,
|
||||
"flag": "FLAG_UNK_1BB",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_5",
|
||||
"scr": 0,
|
||||
"dirn": 0,
|
||||
"eye": 0,
|
||||
@ -376,7 +376,7 @@
|
||||
"ovid": "SPRITE_ROCKETM",
|
||||
"mvt": 0,
|
||||
"type": 0,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_1",
|
||||
"scr": "_EV_scr_seq_T25_016 + 1",
|
||||
"dirn": 1,
|
||||
"eye": 0,
|
||||
@ -393,7 +393,7 @@
|
||||
"ovid": "SPRITE_ROCKETM",
|
||||
"mvt": 0,
|
||||
"type": 0,
|
||||
"flag": "FLAG_UNK_1BA",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_4",
|
||||
"scr": "_EV_scr_seq_T25_009 + 1",
|
||||
"dirn": 1,
|
||||
"eye": 0,
|
||||
@ -410,7 +410,7 @@
|
||||
"ovid": "SPRITE_ROCKETM",
|
||||
"mvt": 0,
|
||||
"type": 0,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_1",
|
||||
"scr": "_EV_scr_seq_T25_031 + 1",
|
||||
"dirn": 0,
|
||||
"eye": 0,
|
||||
@ -427,7 +427,7 @@
|
||||
"ovid": "SPRITE_GSWOMAN2",
|
||||
"mvt": 0,
|
||||
"type": 0,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_1",
|
||||
"scr": "_EV_scr_seq_T25_030 + 1",
|
||||
"dirn": 1,
|
||||
"eye": 0,
|
||||
|
||||
@ -41,7 +41,7 @@
|
||||
"ovid": "SPRITE_GSWOMAN6",
|
||||
"mvt": 14,
|
||||
"type": 0,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_2",
|
||||
"scr": "_EV_scr_seq_D23R0101_001 + 1",
|
||||
"dirn": 0,
|
||||
"eye": 0,
|
||||
@ -58,7 +58,7 @@
|
||||
"ovid": "SPRITE_GSWOMAN6",
|
||||
"mvt": 14,
|
||||
"type": 0,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_2",
|
||||
"scr": "_EV_scr_seq_D23R0101_002 + 1",
|
||||
"dirn": 0,
|
||||
"eye": 0,
|
||||
@ -75,7 +75,7 @@
|
||||
"ovid": "SPRITE_GSMAN1",
|
||||
"mvt": 17,
|
||||
"type": 0,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_2",
|
||||
"scr": "_EV_scr_seq_D23R0101_004 + 1",
|
||||
"dirn": 3,
|
||||
"eye": 0,
|
||||
@ -92,7 +92,7 @@
|
||||
"ovid": "SPRITE_GSGIRL2",
|
||||
"mvt": 16,
|
||||
"type": 0,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_2",
|
||||
"scr": "_EV_scr_seq_D23R0101_003 + 1",
|
||||
"dirn": 2,
|
||||
"eye": 0,
|
||||
@ -126,7 +126,7 @@
|
||||
"ovid": "SPRITE_ROCKETM",
|
||||
"mvt": 16,
|
||||
"type": 0,
|
||||
"flag": "FLAG_UNK_1BC",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_6",
|
||||
"scr": "_EV_scr_seq_D23R0101_005 + 1",
|
||||
"dirn": 2,
|
||||
"eye": 0,
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
"ovid": "SPRITE_GSMAN1",
|
||||
"mvt": 2,
|
||||
"type": 0,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_2",
|
||||
"scr": "_EV_scr_seq_D23R0102_005 + 1",
|
||||
"dirn": 3,
|
||||
"eye": 0,
|
||||
@ -83,7 +83,7 @@
|
||||
"ovid": "SPRITE_POLICEMAN",
|
||||
"mvt": 0,
|
||||
"type": 0,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_2",
|
||||
"scr": "_EV_scr_seq_D23R0102_006 + 1",
|
||||
"dirn": 3,
|
||||
"eye": 0,
|
||||
@ -100,7 +100,7 @@
|
||||
"ovid": "SPRITE_ROCKETM",
|
||||
"mvt": 0,
|
||||
"type": 1,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_1",
|
||||
"scr": "std_trainer(TRAINER_TEAM_ROCKET_GRUNT_5)",
|
||||
"dirn": 1,
|
||||
"eye": 2,
|
||||
@ -117,7 +117,7 @@
|
||||
"ovid": "SPRITE_ROCKETW",
|
||||
"mvt": 0,
|
||||
"type": 1,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_1",
|
||||
"scr": "std_trainer(TRAINER_TEAM_ROCKET_F_GRUNT_2)",
|
||||
"dirn": 0,
|
||||
"eye": 4,
|
||||
@ -134,7 +134,7 @@
|
||||
"ovid": "SPRITE_ROCKETM",
|
||||
"mvt": 18,
|
||||
"type": 1,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_1",
|
||||
"scr": "std_trainer(TRAINER_TEAM_ROCKET_GRUNT_6)",
|
||||
"dirn": 1,
|
||||
"eye": 2,
|
||||
@ -151,7 +151,7 @@
|
||||
"ovid": "SPRITE_ROCKETM",
|
||||
"mvt": 0,
|
||||
"type": 1,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_1",
|
||||
"scr": "std_trainer(TRAINER_TEAM_ROCKET_GRUNT_4)",
|
||||
"dirn": 3,
|
||||
"eye": 2,
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
"ovid": "SPRITE_ROCKETM",
|
||||
"mvt": 0,
|
||||
"type": 1,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_1",
|
||||
"scr": "std_trainer(TRAINER_TEAM_ROCKET_GRUNT_7)",
|
||||
"dirn": 1,
|
||||
"eye": 3,
|
||||
@ -49,7 +49,7 @@
|
||||
"ovid": "SPRITE_ROCKETM",
|
||||
"mvt": 0,
|
||||
"type": 1,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_1",
|
||||
"scr": "std_trainer(TRAINER_TEAM_ROCKET_GRUNT_8)",
|
||||
"dirn": 1,
|
||||
"eye": 2,
|
||||
@ -66,7 +66,7 @@
|
||||
"ovid": "SPRITE_ASSISTANTM",
|
||||
"mvt": 0,
|
||||
"type": 1,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_1",
|
||||
"scr": "std_trainer(TRAINER_SCIENTIST_GS_GARETT)",
|
||||
"dirn": 0,
|
||||
"eye": 2,
|
||||
@ -117,7 +117,7 @@
|
||||
"ovid": "SPRITE_GSMAN1",
|
||||
"mvt": 0,
|
||||
"type": 0,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_2",
|
||||
"scr": "_EV_scr_seq_D23R0103_004 + 1",
|
||||
"dirn": 0,
|
||||
"eye": 0,
|
||||
@ -134,7 +134,7 @@
|
||||
"ovid": "SPRITE_ROCKETM",
|
||||
"mvt": 0,
|
||||
"type": 1,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_1",
|
||||
"scr": "std_trainer(TRAINER_TEAM_ROCKET_GRUNT_9)",
|
||||
"dirn": 0,
|
||||
"eye": 2,
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
"ovid": "SPRITE_ASSISTANTM",
|
||||
"mvt": 0,
|
||||
"type": 1,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_1",
|
||||
"scr": "std_trainer(TRAINER_SCIENTIST_GS_TRENTON)",
|
||||
"dirn": 0,
|
||||
"eye": 4,
|
||||
@ -41,7 +41,7 @@
|
||||
"ovid": "SPRITE_ROCKETM",
|
||||
"mvt": 0,
|
||||
"type": 1,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_1",
|
||||
"scr": "std_trainer(TRAINER_TEAM_ROCKET_GRUNT_10)",
|
||||
"dirn": 1,
|
||||
"eye": 4,
|
||||
@ -58,7 +58,7 @@
|
||||
"ovid": "SPRITE_ROCKETW",
|
||||
"mvt": 0,
|
||||
"type": 1,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_1",
|
||||
"scr": "_EV_scr_seq_D23R0104_007 + 1",
|
||||
"dirn": 0,
|
||||
"eye": 0,
|
||||
@ -75,7 +75,7 @@
|
||||
"ovid": "SPRITE_RKANBUM3",
|
||||
"mvt": 0,
|
||||
"type": 1,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_1",
|
||||
"scr": "std_trainer(TRAINER_EXECUTIVE_PROTON_PROTON_2)",
|
||||
"dirn": 0,
|
||||
"eye": 3,
|
||||
@ -126,7 +126,7 @@
|
||||
"ovid": "SPRITE_GSBIGMAN",
|
||||
"mvt": 0,
|
||||
"type": 0,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_2",
|
||||
"scr": "_EV_scr_seq_D23R0104_003 + 1",
|
||||
"dirn": 0,
|
||||
"eye": 0,
|
||||
|
||||
@ -41,7 +41,7 @@
|
||||
"ovid": "SPRITE_RKANBUW",
|
||||
"mvt": 0,
|
||||
"type": 1,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_1",
|
||||
"scr": "std_trainer(TRAINER_EXECUTIVE_ARIANA_ARIANA)",
|
||||
"dirn": 3,
|
||||
"eye": 4,
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
"ovid": "SPRITE_RKANBUM",
|
||||
"mvt": 0,
|
||||
"type": 0,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_1",
|
||||
"scr": "_EV_scr_seq_D23R0106_001 + 1",
|
||||
"dirn": 0,
|
||||
"eye": 0,
|
||||
@ -23,7 +23,7 @@
|
||||
"ovid": "SPRITE_GSGENTLEMAN",
|
||||
"mvt": 0,
|
||||
"type": 0,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_2",
|
||||
"scr": 0,
|
||||
"dirn": 1,
|
||||
"eye": 0,
|
||||
|
||||
@ -84,7 +84,7 @@
|
||||
"ovid": "SPRITE_GSWOMAN1",
|
||||
"mvt": 0,
|
||||
"type": 0,
|
||||
"flag": "FLAG_UNK_1BE",
|
||||
"flag": "FLAG_HIDE_GOLDENROD_DEPT_STORE_5F_RETURN_FRUSTRATION_LADY",
|
||||
"scr": "_EV_scr_seq_T25R1005_006 + 1",
|
||||
"dirn": 2,
|
||||
"eye": 0,
|
||||
|
||||
@ -172,7 +172,7 @@
|
||||
"ovid": "SPRITE_MANIA",
|
||||
"mvt": 0,
|
||||
"type": 1,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_2",
|
||||
"scr": "std_trainer(TRAINER_POKE_MANIAC_DONALD)",
|
||||
"dirn": 3,
|
||||
"eye": 4,
|
||||
@ -189,7 +189,7 @@
|
||||
"ovid": "SPRITE_GSASSISTANTM",
|
||||
"mvt": 0,
|
||||
"type": 1,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_2",
|
||||
"scr": "std_trainer(TRAINER_SUPER_NERD_TERU)",
|
||||
"dirn": 2,
|
||||
"eye": 4,
|
||||
@ -206,7 +206,7 @@
|
||||
"ovid": "SPRITE_MANIA",
|
||||
"mvt": 0,
|
||||
"type": 1,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_2",
|
||||
"scr": "std_trainer(TRAINER_POKE_MANIAC_ISSAC)",
|
||||
"dirn": 3,
|
||||
"eye": 6,
|
||||
@ -223,7 +223,7 @@
|
||||
"ovid": "SPRITE_GSASSISTANTM",
|
||||
"mvt": 0,
|
||||
"type": 1,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_2",
|
||||
"scr": "std_trainer(TRAINER_SUPER_NERD_ERIC)",
|
||||
"dirn": 2,
|
||||
"eye": 6,
|
||||
@ -257,7 +257,7 @@
|
||||
"ovid": "SPRITE_MOUNT_2",
|
||||
"mvt": 0,
|
||||
"type": 0,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_2",
|
||||
"scr": "_EV_scr_seq_D37R0102_005 + 1",
|
||||
"dirn": 2,
|
||||
"eye": 0,
|
||||
@ -274,7 +274,7 @@
|
||||
"ovid": "SPRITE_GSMIDDLEMAN1",
|
||||
"mvt": 0,
|
||||
"type": 0,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_2",
|
||||
"scr": "_EV_scr_seq_D37R0102_006 + 1",
|
||||
"dirn": 2,
|
||||
"eye": 0,
|
||||
@ -325,7 +325,7 @@
|
||||
"ovid": "SPRITE_MOUNT_2",
|
||||
"mvt": 0,
|
||||
"type": 0,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_2",
|
||||
"scr": "_EV_scr_seq_D37R0102_023 + 1",
|
||||
"dirn": 1,
|
||||
"eye": 0,
|
||||
|
||||
@ -40,7 +40,7 @@
|
||||
"ovid": "SPRITE_ROCKETM",
|
||||
"mvt": 15,
|
||||
"type": 1,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_1",
|
||||
"scr": "std_trainer(TRAINER_TEAM_ROCKET_GRUNT_11)",
|
||||
"dirn": 1,
|
||||
"eye": 1,
|
||||
@ -57,7 +57,7 @@
|
||||
"ovid": "SPRITE_ROCKETM",
|
||||
"mvt": 15,
|
||||
"type": 1,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_1",
|
||||
"scr": "std_trainer(TRAINER_TEAM_ROCKET_GRUNT_23)",
|
||||
"dirn": 1,
|
||||
"eye": 3,
|
||||
@ -74,7 +74,7 @@
|
||||
"ovid": "SPRITE_ROCKETM",
|
||||
"mvt": 17,
|
||||
"type": 1,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_1",
|
||||
"scr": "std_trainer(TRAINER_TEAM_ROCKET_GRUNT_12)",
|
||||
"dirn": 3,
|
||||
"eye": 4,
|
||||
@ -91,7 +91,7 @@
|
||||
"ovid": "SPRITE_ROCKETW",
|
||||
"mvt": 15,
|
||||
"type": 1,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_1",
|
||||
"scr": "std_trainer(TRAINER_TEAM_ROCKET_F_GRUNT_3)",
|
||||
"dirn": 1,
|
||||
"eye": 2,
|
||||
@ -108,7 +108,7 @@
|
||||
"ovid": "SPRITE_THIEF",
|
||||
"mvt": 16,
|
||||
"type": 1,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_1",
|
||||
"scr": "std_trainer(TRAINER_BURGLAR_ORSON)",
|
||||
"dirn": 2,
|
||||
"eye": 4,
|
||||
@ -125,7 +125,7 @@
|
||||
"ovid": "SPRITE_THIEF",
|
||||
"mvt": 17,
|
||||
"type": 1,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_1",
|
||||
"scr": "std_trainer(TRAINER_BURGLAR_DUNCAN)",
|
||||
"dirn": 3,
|
||||
"eye": 3,
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
"ovid": "SPRITE_ROCKETM",
|
||||
"mvt": 16,
|
||||
"type": 1,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_1",
|
||||
"scr": "std_trainer(TRAINER_TEAM_ROCKET_GRUNT_13)",
|
||||
"dirn": 2,
|
||||
"eye": 3,
|
||||
@ -41,7 +41,7 @@
|
||||
"ovid": "SPRITE_ROCKETM",
|
||||
"mvt": 44,
|
||||
"type": 1,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_1",
|
||||
"scr": "std_trainer(TRAINER_TEAM_ROCKET_GRUNT_14)",
|
||||
"dirn": 1,
|
||||
"eye": 3,
|
||||
@ -58,7 +58,7 @@
|
||||
"ovid": "SPRITE_ROCKETM",
|
||||
"mvt": 17,
|
||||
"type": 1,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_1",
|
||||
"scr": "std_trainer(TRAINER_TEAM_ROCKET_GRUNT_22)",
|
||||
"dirn": 3,
|
||||
"eye": 3,
|
||||
@ -75,7 +75,7 @@
|
||||
"ovid": "SPRITE_GSGENTLEMAN",
|
||||
"mvt": 0,
|
||||
"type": 0,
|
||||
"flag": "FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR",
|
||||
"flag": "FLAG_HIDE_ROCKET_TAKEOVER_2",
|
||||
"scr": "_EV_scr_seq_D37R0105_001 + 1",
|
||||
"dirn": 1,
|
||||
"eye": 0,
|
||||
|
||||
@ -19,11 +19,11 @@
|
||||
scrdef_end
|
||||
|
||||
scr_seq_D23R0101_008:
|
||||
setflag FLAG_UNK_1BC
|
||||
setflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR
|
||||
setflag FLAG_HIDE_ROCKET_TAKEOVER_6
|
||||
setflag FLAG_HIDE_ROCKET_TAKEOVER_2
|
||||
compare VAR_SCENE_ROCKET_TAKEOVER, 2
|
||||
goto_if_ne _004D
|
||||
clearflag FLAG_UNK_1BC
|
||||
clearflag FLAG_HIDE_ROCKET_TAKEOVER_6
|
||||
goto _0085
|
||||
|
||||
_004D:
|
||||
@ -34,12 +34,12 @@ _004D:
|
||||
_0066:
|
||||
compare VAR_SCENE_ROCKET_TAKEOVER, 3
|
||||
goto_if_ne _0081
|
||||
clearflag FLAG_UNK_1BC
|
||||
clearflag FLAG_HIDE_ROCKET_TAKEOVER_6
|
||||
clearflag FLAG_HIDE_RADIO_TOWER_RIVAL
|
||||
goto _0085
|
||||
|
||||
_0081:
|
||||
clearflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR
|
||||
clearflag FLAG_HIDE_ROCKET_TAKEOVER_2
|
||||
_0085:
|
||||
setvar VAR_TEMP_x400A, 0
|
||||
_008B:
|
||||
|
||||
@ -19,21 +19,21 @@
|
||||
scrdef_end
|
||||
|
||||
scr_seq_D23R0102_007:
|
||||
setflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER
|
||||
setflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR
|
||||
setflag FLAG_HIDE_ROCKET_TAKEOVER_1
|
||||
setflag FLAG_HIDE_ROCKET_TAKEOVER_2
|
||||
compare VAR_SCENE_ROCKET_TAKEOVER, 4
|
||||
goto_if_ne _004D
|
||||
clearflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER
|
||||
clearflag FLAG_HIDE_ROCKET_TAKEOVER_1
|
||||
goto _0068
|
||||
|
||||
_004D:
|
||||
compare VAR_SCENE_ROCKET_TAKEOVER, 2
|
||||
goto_if_ge _0064
|
||||
clearflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR
|
||||
clearflag FLAG_HIDE_ROCKET_TAKEOVER_2
|
||||
goto _0068
|
||||
|
||||
_0064:
|
||||
clearflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR
|
||||
clearflag FLAG_HIDE_ROCKET_TAKEOVER_2
|
||||
_0068:
|
||||
end
|
||||
|
||||
|
||||
@ -16,17 +16,17 @@
|
||||
scrdef_end
|
||||
|
||||
scr_seq_D23R0103_000:
|
||||
setflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER
|
||||
setflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR
|
||||
setflag FLAG_HIDE_ROCKET_TAKEOVER_1
|
||||
setflag FLAG_HIDE_ROCKET_TAKEOVER_2
|
||||
compare VAR_SCENE_ROCKET_TAKEOVER, 4
|
||||
goto_if_ne _0041
|
||||
clearflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER
|
||||
clearflag FLAG_HIDE_ROCKET_TAKEOVER_1
|
||||
goto _0052
|
||||
|
||||
_0041:
|
||||
compare VAR_SCENE_ROCKET_TAKEOVER, 5
|
||||
goto_if_ne _0052
|
||||
clearflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR
|
||||
clearflag FLAG_HIDE_ROCKET_TAKEOVER_2
|
||||
_0052:
|
||||
end
|
||||
|
||||
|
||||
@ -17,17 +17,17 @@
|
||||
scrdef_end
|
||||
|
||||
scr_seq_D23R0104_000:
|
||||
setflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER
|
||||
setflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR
|
||||
setflag FLAG_HIDE_ROCKET_TAKEOVER_1
|
||||
setflag FLAG_HIDE_ROCKET_TAKEOVER_2
|
||||
compare VAR_SCENE_ROCKET_TAKEOVER, 4
|
||||
goto_if_ne _0045
|
||||
clearflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER
|
||||
clearflag FLAG_HIDE_ROCKET_TAKEOVER_1
|
||||
goto _0056
|
||||
|
||||
_0045:
|
||||
compare VAR_SCENE_ROCKET_TAKEOVER, 5
|
||||
goto_if_ne _0056
|
||||
clearflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR
|
||||
clearflag FLAG_HIDE_ROCKET_TAKEOVER_2
|
||||
_0056:
|
||||
end
|
||||
|
||||
|
||||
@ -12,11 +12,11 @@
|
||||
scrdef_end
|
||||
|
||||
scr_seq_D23R0105_000:
|
||||
setflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER
|
||||
setflag FLAG_HIDE_ROCKET_TAKEOVER_1
|
||||
setvar VAR_UNK_4125, 0
|
||||
compare VAR_SCENE_ROCKET_TAKEOVER, 4
|
||||
goto_if_ne _002D
|
||||
clearflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER
|
||||
clearflag FLAG_HIDE_ROCKET_TAKEOVER_1
|
||||
_002D:
|
||||
end
|
||||
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
scrdef_end
|
||||
|
||||
scr_seq_D23R0106_000:
|
||||
setflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER
|
||||
setflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR
|
||||
setflag FLAG_HIDE_ROCKET_TAKEOVER_1
|
||||
setflag FLAG_HIDE_ROCKET_TAKEOVER_2
|
||||
setvar VAR_UNK_4125, 0
|
||||
compare VAR_SCENE_ROCKET_TAKEOVER, 4
|
||||
goto_if_ne _002D
|
||||
clearflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER
|
||||
clearflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR
|
||||
clearflag FLAG_HIDE_ROCKET_TAKEOVER_1
|
||||
clearflag FLAG_HIDE_ROCKET_TAKEOVER_2
|
||||
_002D:
|
||||
end
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@ scr_seq_D37R0102_008:
|
||||
setflag FLAG_UNK_1B2
|
||||
setflag FLAG_UNK_1B3
|
||||
setflag FLAG_UNK_1B4
|
||||
setflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR
|
||||
setflag FLAG_HIDE_ROCKET_TAKEOVER_2
|
||||
compare VAR_SCENE_ROCKET_TAKEOVER, 2
|
||||
goto_if_eq _0144
|
||||
compare VAR_SCENE_ROCKET_TAKEOVER, 4
|
||||
@ -83,7 +83,7 @@ _011C:
|
||||
_0131:
|
||||
compare VAR_TEMP_x4000, 1
|
||||
call_if_eq _0161
|
||||
clearflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR
|
||||
clearflag FLAG_HIDE_ROCKET_TAKEOVER_2
|
||||
end
|
||||
|
||||
_0144:
|
||||
|
||||
@ -15,10 +15,10 @@
|
||||
scrdef_end
|
||||
|
||||
scr_seq_D37R0104_006:
|
||||
setflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER
|
||||
setflag FLAG_HIDE_ROCKET_TAKEOVER_1
|
||||
compare VAR_SCENE_ROCKET_TAKEOVER, 4
|
||||
goto_if_ne _0033
|
||||
clearflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER
|
||||
clearflag FLAG_HIDE_ROCKET_TAKEOVER_1
|
||||
_0033:
|
||||
setvar VAR_TEMP_x4000, 0
|
||||
setvar VAR_TEMP_x4001, 0
|
||||
|
||||
@ -10,12 +10,12 @@
|
||||
scrdef_end
|
||||
|
||||
scr_seq_D37R0105_000:
|
||||
setflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER
|
||||
setflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR
|
||||
setflag FLAG_HIDE_ROCKET_TAKEOVER_1
|
||||
setflag FLAG_HIDE_ROCKET_TAKEOVER_2
|
||||
compare VAR_SCENE_ROCKET_TAKEOVER, 4
|
||||
goto_if_ne _0027
|
||||
clearflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER
|
||||
clearflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR
|
||||
clearflag FLAG_HIDE_ROCKET_TAKEOVER_1
|
||||
clearflag FLAG_HIDE_ROCKET_TAKEOVER_2
|
||||
_0027:
|
||||
end
|
||||
|
||||
|
||||
@ -41,44 +41,44 @@
|
||||
scrdef_end
|
||||
|
||||
scr_seq_T25_018:
|
||||
setflag FLAG_UNK_1B9
|
||||
setflag FLAG_UNK_1BA
|
||||
setflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER
|
||||
setflag FLAG_UNK_1BB
|
||||
setflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR
|
||||
setflag FLAG_HIDE_ROCKET_TAKEOVER_3
|
||||
setflag FLAG_HIDE_ROCKET_TAKEOVER_4
|
||||
setflag FLAG_HIDE_ROCKET_TAKEOVER_1
|
||||
setflag FLAG_HIDE_ROCKET_TAKEOVER_5
|
||||
setflag FLAG_HIDE_ROCKET_TAKEOVER_2
|
||||
compare VAR_SCENE_ROCKET_TAKEOVER, 0
|
||||
goto_if_ne _00B5
|
||||
clearflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR
|
||||
clearflag FLAG_UNK_1B9
|
||||
clearflag FLAG_HIDE_ROCKET_TAKEOVER_2
|
||||
clearflag FLAG_HIDE_ROCKET_TAKEOVER_3
|
||||
goto _011A
|
||||
|
||||
_00B5:
|
||||
compare VAR_SCENE_ROCKET_TAKEOVER, 1
|
||||
goto_if_ne _00D4
|
||||
clearflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR
|
||||
clearflag FLAG_UNK_1B9
|
||||
clearflag FLAG_UNK_1BA
|
||||
clearflag FLAG_HIDE_ROCKET_TAKEOVER_2
|
||||
clearflag FLAG_HIDE_ROCKET_TAKEOVER_3
|
||||
clearflag FLAG_HIDE_ROCKET_TAKEOVER_4
|
||||
goto _011A
|
||||
|
||||
_00D4:
|
||||
compare VAR_SCENE_ROCKET_TAKEOVER, 3
|
||||
goto_if_ne _00F7
|
||||
clearflag FLAG_UNK_1B9
|
||||
clearflag FLAG_UNK_1BA
|
||||
clearflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER
|
||||
clearflag FLAG_UNK_1BB
|
||||
clearflag FLAG_HIDE_ROCKET_TAKEOVER_3
|
||||
clearflag FLAG_HIDE_ROCKET_TAKEOVER_4
|
||||
clearflag FLAG_HIDE_ROCKET_TAKEOVER_1
|
||||
clearflag FLAG_HIDE_ROCKET_TAKEOVER_5
|
||||
goto _011A
|
||||
|
||||
_00F7:
|
||||
compare VAR_SCENE_ROCKET_TAKEOVER, 5
|
||||
goto_if_ne _010E
|
||||
clearflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_DIRECTOR
|
||||
clearflag FLAG_HIDE_ROCKET_TAKEOVER_2
|
||||
goto _011A
|
||||
|
||||
_010E:
|
||||
clearflag FLAG_UNK_1B9
|
||||
clearflag FLAG_UNK_1BA
|
||||
clearflag FLAG_HIDE_RADIO_TOWER_OBSERVATION_DECK_ARCHER
|
||||
clearflag FLAG_HIDE_ROCKET_TAKEOVER_3
|
||||
clearflag FLAG_HIDE_ROCKET_TAKEOVER_4
|
||||
clearflag FLAG_HIDE_ROCKET_TAKEOVER_1
|
||||
_011A:
|
||||
end
|
||||
|
||||
|
||||
@ -15,18 +15,18 @@
|
||||
scrdef_end
|
||||
|
||||
scr_seq_T25R1005_005:
|
||||
setflag FLAG_UNK_1BE
|
||||
setflag FLAG_HIDE_GOLDENROD_DEPT_STORE_5F_RETURN_FRUSTRATION_LADY
|
||||
get_weekday VAR_TEMP_x4000
|
||||
compare VAR_TEMP_x4000, 0
|
||||
goto_if_eq _0046
|
||||
compare VAR_TEMP_x4000, 0
|
||||
goto_if_ne _0044
|
||||
clearflag FLAG_UNK_1BE
|
||||
clearflag FLAG_HIDE_GOLDENROD_DEPT_STORE_5F_RETURN_FRUSTRATION_LADY
|
||||
_0044:
|
||||
end
|
||||
|
||||
_0046:
|
||||
clearflag FLAG_UNK_1BE
|
||||
clearflag FLAG_HIDE_GOLDENROD_DEPT_STORE_5F_RETURN_FRUSTRATION_LADY
|
||||
end
|
||||
|
||||
scr_seq_T25R1005_000:
|
||||
|
||||
@ -422,6 +422,7 @@ $(eval $(call arc_strip_name,files/poketool/trmsg/trtblofs.narc,files/a/1/3/1))
|
||||
$(eval $(call arc_strip_name,files/application/zukanlist/zukan_data/zukan_enc_$(shortname).narc,files/a/1/3/3))
|
||||
$(eval $(call arc_strip_name,files/fielddata/encountdata/s_enc_data.narc,files/a/1/3/6))
|
||||
$(eval $(call arc_strip_name,files/poketool/johtozukan.narc,files/a/1/3/8))
|
||||
$(eval $(call arc_strip_name,files/fielddata/tsurepoke/tp_param.narc,files/a/1/4/1))
|
||||
$(eval $(call arc_strip_name,files/data/gs_areawindow.narc,files/a/1/6/3))
|
||||
$(eval $(call arc_strip_name,files/poketool/personal/performance.narc,files/a/1/6/9))
|
||||
$(eval $(call arc_strip_name,files/application/annon/puzzle_gra.narc,files/a/1/7/2))
|
||||
@ -430,6 +431,7 @@ $(eval $(call arc_strip_name,files/pbr/dp_height.narc,files/a/1/9/4))
|
||||
$(eval $(call arc_strip_name,files/pbr/dp_height_o.narc,files/a/1/9/5))
|
||||
$(eval $(call arc_strip_name,files/resource/eng/pms_aikotoba/pms_aikotoba.narc,files/a/2/1/2))
|
||||
$(eval $(call arc_strip_name,files/application/zukanlist/zukan_data/zukan_data_gira.narc,files/a/2/1/4))
|
||||
$(eval $(call arc_strip_name,files/fielddata/sodateya/kowaza_list.narc,files/a/2/2/9))
|
||||
$(eval $(call arc_strip_name,files/a/2/5/2.$(buildname),files/a/2/5/2))
|
||||
|
||||
$(DIFF_ARCS):
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user