ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-13 07:03:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into sub_81700F8

Browse Source
This commit is contained in:
PikalaxALT 2017-09-19 21:00:24 -04:00
commit 5fc2c964fb
79 changed files with 14775 additions and 32811 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -24,3 +24,4 @@ tools/*
*.sa*
Thumbs.db
.DS_Store
*.ddump

94
asm/battle_2.s
View File

@ -6434,7 +6434,7 @@ _08039FDC:
strb r1, [r0]
ldr r2, =gBattleWeather
strh r1, [r2]
ldr r1, =gUnknown_020243D0
ldr r1, =gWishFutureKnock
movs r2, 0
movs r3, 0
_0803A004:
@ -7808,7 +7808,7 @@ _0803ABD4:
movs r2, 0
bl dp01_build_cmdbuf_x00_a_b_0
ldrb r0, [r4]
bl dp01_battle_side_mark_buffer_for_execution
bl MarkBufferBankForExecution
ldrb r0, [r5]
adds r0, 0x1
strb r0, [r5]
@ -7857,7 +7857,7 @@ bc_load_battlefield: @ 803AC34
movs r0, 0
bl dp01_build_cmdbuf_x2E_a
ldrb r0, [r4]
bl dp01_battle_side_mark_buffer_for_execution
bl MarkBufferBankForExecution
ldr r1, =gBattleMainFunc
ldr r0, =sub_803AC84
str r0, [r1]
@ -8040,7 +8040,7 @@ _0803ADCA:
movs r0, 0
bl dp01_build_cmdbuf_x07_7_7_7
ldrb r0, [r4]
bl dp01_battle_side_mark_buffer_for_execution
bl MarkBufferBankForExecution
_0803ADE4:
ldr r5, =gBattleTypeFlags
ldr r0, [r5]
@ -8057,7 +8057,7 @@ _0803ADE4:
movs r0, 0
bl dp01_build_cmdbuf_x07_7_7_7
ldrb r0, [r4]
bl dp01_battle_side_mark_buffer_for_execution
bl MarkBufferBankForExecution
_0803AE0A:
ldrb r0, [r4]
bl GetBankSide
@ -8114,7 +8114,7 @@ _0803AE96:
movs r0, 0
bl dp01_build_cmdbuf_x04_4_4_4
ldrb r0, [r4]
bl dp01_battle_side_mark_buffer_for_execution
bl MarkBufferBankForExecution
ldr r1, =gBattlePartyID
ldrb r0, [r4]
lsls r0, 1
@ -8153,7 +8153,7 @@ _0803AEEA:
movs r0, 0
bl dp01_build_cmdbuf_x07_7_7_7
ldrb r0, [r4]
bl dp01_battle_side_mark_buffer_for_execution
bl MarkBufferBankForExecution
_0803AEF6:
ldr r0, =gBattleTypeFlags
ldr r0, [r0]
@ -8172,7 +8172,7 @@ _0803AEF6:
movs r0, 0
bl dp01_build_cmdbuf_x07_7_7_7
ldrb r0, [r4]
bl dp01_battle_side_mark_buffer_for_execution
bl MarkBufferBankForExecution
_0803AF20:
ldr r0, =gBattleTypeFlags
ldr r0, [r0]
@ -8282,7 +8282,7 @@ _0803AFFA:
movs r2, 0x80
bl dp01_build_cmdbuf_x30_TODO
ldrb r0, [r4]
bl dp01_battle_side_mark_buffer_for_execution
bl MarkBufferBankForExecution
movs r7, 0
mov r6, r8
mov r5, sp
@ -8334,7 +8334,7 @@ _0803B072:
movs r2, 0x80
bl dp01_build_cmdbuf_x30_TODO
ldrb r0, [r4]
bl dp01_battle_side_mark_buffer_for_execution
bl MarkBufferBankForExecution
ldr r1, =gBattleMainFunc
ldr r0, =bc_battle_begin_message
b _0803B10A
@ -8522,7 +8522,7 @@ _0803B20E:
movs r0, 0
bl dp01_build_cmdbuf_x2F_2F_2F_2F
ldrb r0, [r4]
bl dp01_battle_side_mark_buffer_for_execution
bl MarkBufferBankForExecution
_0803B228:
ldrb r0, [r4]
adds r0, 0x1
@ -8596,7 +8596,7 @@ _0803B2B2:
movs r0, 0
bl dp01_build_cmdbuf_x2F_2F_2F_2F
ldrb r0, [r4]
bl dp01_battle_side_mark_buffer_for_execution
bl MarkBufferBankForExecution
ldr r0, =gBattleTypeFlags
ldr r0, [r0]
ldr r1, =0x00008040
@ -8793,7 +8793,7 @@ _0803B45E:
movs r0, 0
bl dp01_build_cmdbuf_x2F_2F_2F_2F
ldrb r0, [r4]
bl dp01_battle_side_mark_buffer_for_execution
bl MarkBufferBankForExecution
_0803B478:
ldrb r0, [r4]
adds r0, 0x1
@ -8877,7 +8877,7 @@ _0803B51A:
movs r0, 0
bl dp01_build_cmdbuf_x2F_2F_2F_2F
ldrb r0, [r4]
bl dp01_battle_side_mark_buffer_for_execution
bl MarkBufferBankForExecution
ldr r0, =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x40
@ -8949,7 +8949,7 @@ _0803B5B2:
movs r2, 0
bl dp01_build_cmdbuf_x05_a_b_c
ldrb r0, [r4]
bl dp01_battle_side_mark_buffer_for_execution
bl MarkBufferBankForExecution
_0803B5D4:
ldrb r0, [r4]
adds r0, 0x1
@ -9177,7 +9177,7 @@ _0803B79A:
ldrb r1, [r0]
movs r0, 0
movs r2, 0
bl berry_effects_maybe
bl ItemBattleEffects
lsls r0, 24
cmp r0, 0
beq _0803B7BC
@ -9208,7 +9208,7 @@ _0803B7DA:
mov r8, r1
movs r7, 0x6
ldr r6, =gUnknown_0202421C
ldr r2, =gUnknown_02024274
ldr r2, =gChosenMovesByBanks
movs r4, 0xFF
movs r3, 0
_0803B7EA:
@ -9328,7 +9328,7 @@ bc_8013B1C: @ 803B904
cmp r0, 0
bne _0803B994
ldr r1, =gBattleMainFunc
ldr r0, =sub_803B9BC
ldr r0, =BattleTurnPassed
str r0, [r1]
ldr r3, =gNoOfAllBanks
ldr r1, =gBattleCommunication
@ -9404,8 +9404,8 @@ _0803B994:
.pool
thumb_func_end bc_8013B1C
thumb_func_start sub_803B9BC
sub_803B9BC: @ 803B9BC
thumb_func_start BattleTurnPassed
BattleTurnPassed: @ 803B9BC
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@ -9416,13 +9416,13 @@ sub_803B9BC: @ 803B9BC
ldrb r0, [r0]
cmp r0, 0
bne _0803B9EA
bl sub_80401D0
bl UpdateTurnCounters
lsls r0, 24
cmp r0, 0
beq _0803B9DE
b _0803BB78
_0803B9DE:
bl sub_8040924
bl TurnBasedEffects
lsls r0, 24
cmp r0, 0
beq _0803B9EA
@ -9514,7 +9514,7 @@ _0803BAB2:
ldr r7, =gUnknown_0202421C
movs r6, 0xFF
movs r5, 0
ldr r3, =gUnknown_02024274
ldr r3, =gChosenMovesByBanks
_0803BACC:
adds r1, r2, r7
ldrb r0, [r1]
@ -9586,7 +9586,7 @@ _0803BB78:
pop {r0}
bx r0
.pool
thumb_func_end sub_803B9BC
thumb_func_end BattleTurnPassed
thumb_func_start sub_803BB88
sub_803BB88: @ 803BB88
@ -10178,7 +10178,7 @@ _0803C0A8:
.4byte _0803C6C4
.4byte _0803C4B4
_0803C0DC:
bl sub_80400C8
bl AreAllMovesUnusable
lsls r0, 24
cmp r0, 0
beq _0803C134
@ -10223,7 +10223,7 @@ _0803C134:
ldrh r2, [r0, 0x6]
cmp r2, 0
beq _0803C188
ldr r1, =gUnknown_02024274
ldr r1, =gChosenMovesByBanks
lsls r0, r4, 1
adds r0, r1
strh r2, [r0]
@ -10552,7 +10552,7 @@ _0803C410:
_0803C42E:
ldr r0, =gActiveBank
ldrb r0, [r0]
bl dp01_battle_side_mark_buffer_for_execution
bl MarkBufferBankForExecution
b _0803C6C4
.pool
_0803C440:
@ -10596,7 +10596,7 @@ _0803C48C:
movs r0, 0
bl sub_8033E6C
ldrb r0, [r4]
bl dp01_battle_side_mark_buffer_for_execution
bl MarkBufferBankForExecution
b _0803C6C4
.pool
_0803C4B4:
@ -10660,7 +10660,7 @@ _0803C532:
movs r0, 0
bl dp01_build_cmdbuf_x32_32_32_32
ldrb r0, [r5]
bl dp01_battle_side_mark_buffer_for_execution
bl MarkBufferBankForExecution
bl _0803CD70
.pool
_0803C550:
@ -10813,7 +10813,7 @@ _0803C6AE:
bl dp01_build_cmdbuf_x32_32_32_32
ldr r0, =gActiveBank
ldrb r0, [r0]
bl dp01_battle_side_mark_buffer_for_execution
bl MarkBufferBankForExecution
b _0803CD70
.pool
_0803C6C4:
@ -11083,7 +11083,7 @@ _0803C942:
adds r0, r5
ldrb r0, [r0]
strb r0, [r1]
ldr r0, =gUnknown_02024274
ldr r0, =gChosenMovesByBanks
ldrb r2, [r6]
lsls r5, r2, 1
adds r5, r0
@ -11299,7 +11299,7 @@ _0803CB66:
ldr r4, =gActiveBank
_0803CB68:
ldrb r0, [r4]
bl dp01_battle_side_mark_buffer_for_execution
bl MarkBufferBankForExecution
_0803CB6E:
ldr r0, =gBattleCommunication
ldrb r1, [r4]
@ -12704,7 +12704,7 @@ _0803D71C:
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
ldr r1, =gUnknown_02024274
ldr r1, =gChosenMovesByBanks
ldrb r3, [r5]
lsls r0, r3, 1
adds r0, r1
@ -13861,7 +13861,7 @@ _0803E2DC:
adds r0, r1
adds r3, 0xC
adds r0, r3
ldr r1, =gUnknown_02024274
ldr r1, =gChosenMovesByBanks
lsls r2, 1
adds r2, r1
ldrh r3, [r0]
@ -14400,7 +14400,7 @@ _0803E7EC:
movs r0, 0x4
strb r0, [r1, 0x5]
ldr r1, =gBattlescriptCurrInstr
ldr r0, =gUnknown_082DB6AD
ldr r0, =BattleScript_MoveUsedLoafingAround
str r0, [r1]
b _0803E824
.pool
@ -15661,7 +15661,7 @@ _0803F430:
b _0803F47A
.pool
_0803F43C:
ldr r0, =gUnknown_0202420E
ldr r0, =gEffectBank
ldrb r0, [r0]
b _0803F47A
.pool
@ -15674,7 +15674,7 @@ _0803F44C:
b _0803F47A
.pool
_0803F458:
ldr r0, =gUnknown_0202420D
ldr r0, =gBank1
ldrb r0, [r0]
b _0803F47A
.pool
@ -15786,9 +15786,9 @@ _0803F4DE:
movs r0, 0
movs r2, 0
movs r3, 0x1
bl dp01_build_cmdbuf_x02_a_b_varargs
bl EmitSetAttributes
ldrb r0, [r4]
bl dp01_battle_side_mark_buffer_for_execution
bl MarkBufferBankForExecution
_0803F532:
add sp, 0x4
pop {r4-r7}
@ -15933,9 +15933,9 @@ _0803F5F0:
movs r0, 0
movs r2, 0
movs r3, 0x1
bl dp01_build_cmdbuf_x02_a_b_varargs
bl EmitSetAttributes
ldrb r0, [r4]
bl dp01_battle_side_mark_buffer_for_execution
bl MarkBufferBankForExecution
_0803F658:
add sp, 0x4
pop {r3-r5}
@ -16065,9 +16065,9 @@ _0803F6FE:
movs r0, 0
movs r2, 0
movs r3, 0x1
bl dp01_build_cmdbuf_x02_a_b_varargs
bl EmitSetAttributes
ldrb r0, [r4]
bl dp01_battle_side_mark_buffer_for_execution
bl MarkBufferBankForExecution
_0803F762:
add sp, 0x4
pop {r3-r5}
@ -16132,8 +16132,8 @@ _0803F7EE:
.pool
thumb_func_end sub_803F790
thumb_func_start dp01_battle_side_mark_buffer_for_execution
dp01_battle_side_mark_buffer_for_execution: @ 803F800
thumb_func_start MarkBufferBankForExecution
MarkBufferBankForExecution: @ 803F800
push {lr}
lsls r0, 24
lsrs r3, r0, 24
@ -16167,7 +16167,7 @@ _0803F844:
pop {r0}
bx r0
.pool
thumb_func_end dp01_battle_side_mark_buffer_for_execution
thumb_func_end MarkBufferBankForExecution
thumb_func_start sub_803F850
sub_803F850: @ 803F850
@ -16312,7 +16312,7 @@ b_std_message: @ 803F964
adds r1, r2, 0
bl dp01_build_cmdbuf_x10_TODO
ldrb r0, [r4]
bl dp01_battle_side_mark_buffer_for_execution
bl MarkBufferBankForExecution
pop {r4}
pop {r0}
bx r0

11164
asm/battle_3.s
View File

File diff suppressed because it is too large Load Diff

320
asm/battle_4.s
View File

File diff suppressed because it is too large Load Diff

16
asm/battle_5.s
View File

@ -398,7 +398,7 @@ _0805729A:
cmp r0, 0
beq _08057372
mov r0, r9
bl sub_8050650
bl UproarWakeUpCheck
lsls r0, 24
cmp r0, 0
beq _080572FC
@ -419,7 +419,7 @@ _0805729A:
mov r2, r10
strb r0, [r2, 0x5]
ldr r1, =gBattlescriptCurrInstr
ldr r0, =gUnknown_082DB220
ldr r0, =BattleScript_MoveUsedWokeUp
str r0, [r1]
movs r0, 0x2
mov r8, r0
@ -461,7 +461,7 @@ _08057322:
cmp r4, 0
beq _08057354
ldr r1, =gBattlescriptCurrInstr
ldr r0, =gUnknown_082DB213
ldr r0, =BattleScript_MoveUsedIsAsleep
str r0, [r1]
movs r1, 0x2
mov r8, r1
@ -478,7 +478,7 @@ _08057354:
ldr r0, =gBattleCommunication
strb r4, [r0, 0x5]
ldr r1, =gBattlescriptCurrInstr
ldr r0, =gUnknown_082DB220
ldr r0, =BattleScript_MoveUsedWokeUp
str r0, [r1]
movs r2, 0x2
mov r8, r2
@ -513,7 +513,7 @@ _08057390:
cmp r5, 0
beq _080573D4
ldr r1, =gBattlescriptCurrInstr
ldr r0, =gUnknown_082DB26A
ldr r0, =BattleScript_MoveUsedIsFrozen
str r0, [r1]
b _080573EC
.pool
@ -525,7 +525,7 @@ _080573D4:
str r0, [r4]
bl b_movescr_stack_push_cursor
ldr r1, =gBattlescriptCurrInstr
ldr r0, =gUnknown_082DB277
ldr r0, =BattleScript_MoveUsedUnfroze
str r0, [r1]
mov r0, r10
strb r5, [r0, 0x5]
@ -562,9 +562,9 @@ _08057406:
movs r1, 0x28
movs r2, 0
movs r3, 0x4
bl dp01_build_cmdbuf_x02_a_b_varargs
bl EmitSetAttributes
ldrb r0, [r4]
bl dp01_battle_side_mark_buffer_for_execution
bl MarkBufferBankForExecution
_08057430:
mov r0, r8
add sp, 0x4

4
asm/battle_anim_80FE840.s
View File

@ -50069,7 +50069,7 @@ sub_8117E94: @ 8117E94
ldrb r1, [r1]
strb r1, [r2]
ldr r2, =gAnimationBankTarget
ldr r1, =gUnknown_0202420E
ldr r1, =gEffectBank
ldrb r1, [r1]
strb r1, [r2]
bl move_anim_task_del
@ -50136,7 +50136,7 @@ sub_8117F30: @ 8117F30
ldrb r1, [r1]
strb r1, [r2]
ldr r2, =gAnimationBankTarget
ldr r1, =gUnknown_0202420E
ldr r1, =gEffectBank
ldrb r1, [r1]
strb r1, [r2]
bl move_anim_task_del

2
asm/battle_anim_8170478.s
View File

@ -5069,7 +5069,7 @@ sub_8172ED0: @ 8172ED0
lsls r0, 24
lsrs r0, 24
ldr r2, =gAnimationBankTarget
ldr r1, =gUnknown_0202420E
ldr r1, =gEffectBank
ldrb r1, [r1]
strb r1, [r2]
bl move_anim_task_del

1
asm/battle_dome_cards.s
View File

@ -1277,5 +1277,4 @@ _0818D9A2:
bx r1
.pool
thumb_func_end sub_818D97C
.align 2, 0 @ Don't pad with nop.

16
asm/battle_link_817C95C.s
View File

@ -44,7 +44,7 @@ _0817C988:
bl GetBankSide
lsls r0, 24
lsrs r6, r0, 24
ldr r0, =gUnknown_0202420E
ldr r0, =gEffectBank
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@ -145,7 +145,7 @@ _0817CA9C:
bl GetBankIdentity
lsls r0, 24
lsrs r5, r0, 25
ldr r0, =gUnknown_0202420E
ldr r0, =gEffectBank
ldrb r0, [r0]
bl GetBankIdentity
lsls r0, 24
@ -1302,7 +1302,7 @@ _0817D6F2:
bl _0817E0A6
_0817D704:
ldr r5, =gBattlePartyID
ldr r6, =gUnknown_0202420E
ldr r6, =gEffectBank
ldrb r0, [r6]
lsls r0, 1
adds r0, r5
@ -1396,7 +1396,7 @@ _0817D7B2:
.pool
_0817D7D8:
ldr r5, =gBattlePartyID
ldr r6, =gUnknown_0202420E
ldr r6, =gEffectBank
ldrb r0, [r6]
lsls r0, 1
adds r0, r5
@ -1440,7 +1440,7 @@ _0817D7D8:
.pool
_0817D838:
ldr r5, =gBattlePartyID
ldr r6, =gUnknown_0202420E
ldr r6, =gEffectBank
ldrb r0, [r6]
lsls r0, 1
adds r0, r5
@ -1628,7 +1628,7 @@ _0817D9AE:
b _0817E086
_0817D9C2:
ldr r5, =gBattlePartyID
ldr r6, =gUnknown_0202420E
ldr r6, =gEffectBank
ldrb r0, [r6]
lsls r0, 1
adds r0, r5
@ -1703,7 +1703,7 @@ _0817DA48:
.pool
_0817DA68:
ldr r5, =gBattlePartyID
ldr r6, =gUnknown_0202420E
ldr r6, =gEffectBank
ldrb r0, [r6]
lsls r0, 1
adds r0, r5
@ -1791,7 +1791,7 @@ _0817DB10:
.pool
_0817DB24:
ldr r5, =gBattlePartyID
ldr r6, =gUnknown_0202420E
ldr r6, =gEffectBank
ldrb r0, [r6]
lsls r0, 1
adds r0, r5

4
asm/battle_message.s
View File

@ -1349,7 +1349,7 @@ _0814ED5E:
bl _0814F5BE
.pool
_0814ED70:
ldr r5, =gUnknown_0202420E
ldr r5, =gEffectBank
ldrb r0, [r5]
bl GetBankSide
lsls r0, 24
@ -1695,7 +1695,7 @@ _0814F0A8:
.pool
_0814F0B8:
ldr r1, =gAbilitiesPerBank
ldr r0, =gUnknown_0202420E
ldr r0, =gEffectBank
_0814F0BC:
ldrb r0, [r0]
_0814F0BE:

4
asm/battle_transition.s
View File

@ -2151,7 +2151,7 @@ sub_8147018: @ 8147018
ands r5, r0
movs r1, 0
mov r8, r4
ldr r6, =gUnknown_02038C08
ldr r6, =gFieldEffectSpawnParams
_08147046:
lsls r5, 16
asrs r5, 16
@ -2221,7 +2221,7 @@ _081470C4:
sub_81470D0: @ 81470D0
push {r4,r5,lr}
ldr r0, =gUnknown_085C8E68
ldr r5, =gUnknown_02038C08
ldr r5, =gFieldEffectSpawnParams
movs r2, 0
ldrsh r1, [r5, r2]
movs r3, 0x4

92
asm/bike.s
View File

@ -15,7 +15,7 @@ MovePlayerOnBike: @ 8119164
lsrs r4, r1, 16
lsls r2, 16
lsrs r2, 16
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0]
movs r0, 0x2
ands r0, r1
@ -72,7 +72,7 @@ CheckMovementInputMachBike: @ 81191CC
cmp r1, 0
bne _081191F4
strb r0, [r4]
ldr r2, =gUnknown_02037590
ldr r2, =gPlayerAvatar
ldrb r0, [r2, 0xB]
cmp r0, 0
bne _08119208
@ -81,7 +81,7 @@ CheckMovementInputMachBike: @ 81191CC
b _0811921C
.pool
_081191F4:
ldr r2, =gUnknown_02037590
ldr r2, =gPlayerAvatar
cmp r1, r3
beq _08119218
ldrb r0, [r2, 0x2]
@ -126,7 +126,7 @@ sub_8119238: @ 8119238
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -161,7 +161,7 @@ sub_8119280: @ 8119280
lsls r0, 24
lsrs r5, r0, 24
adds r7, r5, 0
ldr r6, =gUnknown_02037590
ldr r6, =gPlayerAvatar
ldrb r1, [r6, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -255,7 +255,7 @@ sub_8119344: @ 8119344
lsls r0, 24
lsrs r5, r0, 24
adds r7, r5, 0
ldr r6, =gUnknown_02037590
ldr r6, =gPlayerAvatar
ldrb r0, [r6, 0xB]
cmp r0, 0
beq _0811935A
@ -352,7 +352,7 @@ CheckMovementInputAcroBike: @ 8119400
lsls r2, 16
lsrs r2, 16
ldr r4, =gUnknown_0859749C
ldr r3, =gUnknown_02037590
ldr r3, =gPlayerAvatar
ldrb r3, [r3, 0x8]
lsls r3, 2
adds r3, r4
@ -377,7 +377,7 @@ CheckMovementInputAcroBikeNormal: @ 811942C
bl player_get_direction_upper_nybble
lsls r0, 24
lsrs r3, r0, 24
ldr r2, =gUnknown_02037590
ldr r2, =gPlayerAvatar
movs r0, 0
strb r0, [r2, 0xA]
ldrb r1, [r4]
@ -417,11 +417,11 @@ _0811946C:
b _081194C0
_0811948A:
ldrb r0, [r4]
ldr r2, =gUnknown_02037590
ldr r2, =gPlayerAvatar
cmp r0, r3
beq _081194BC
_08119492:
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x2]
adds r2, r0, 0
cmp r1, 0x2
@ -453,7 +453,7 @@ _081194C0:
CheckMovementInputAcroBikeChangingDirection: @ 81194C8
push {r4-r6,lr}
adds r5, r0, 0
ldr r4, =gUnknown_02037590
ldr r4, =gPlayerAvatar
ldrb r0, [r4, 0x9]
strb r0, [r5]
ldrb r0, [r4, 0xA]
@ -520,7 +520,7 @@ CheckMovementInputAcroBikeStandingWheelie: @ 8119540
bl player_get_direction_upper_nybble
lsls r0, 24
lsrs r6, r0, 24
ldr r5, =gUnknown_02037590
ldr r5, =gPlayerAvatar
ldrb r1, [r5, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -553,7 +553,7 @@ _08119594:
adds r0, 0x1
strb r0, [r5, 0xA]
_0811959A:
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
ldrb r0, [r1, 0xA]
cmp r0, 0x27
bls _081195B4
@ -608,7 +608,7 @@ CheckMovementInputAcroBikeBunnyHop: @ 81195E0
lsls r0, 24
lsrs r5, r0, 24
adds r2, r5, 0
ldr r4, =gUnknown_02037590
ldr r4, =gPlayerAvatar
ldrb r1, [r4, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -661,7 +661,7 @@ _08119668:
movs r0, 0x6
b _08119676
_0811966E:
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
movs r0, 0x2
strb r0, [r1, 0x2]
movs r0, 0x7
@ -693,7 +693,7 @@ CheckMovementInputAcroBikeMovingWheelie: @ 8119688
lsls r0, 24
lsrs r5, r0, 24
adds r2, r5, 0
ldr r4, =gUnknown_02037590
ldr r4, =gPlayerAvatar
ldrb r1, [r4, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -732,7 +732,7 @@ _081196F6:
movs r0, 0x4
b _08119750
_081196FC:
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
movs r0, 0x2
strb r0, [r1, 0x2]
movs r0, 0xC
@ -770,7 +770,7 @@ _08119736:
movs r0, 0x5
b _08119750
_08119748:
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
movs r0, 0x2
strb r0, [r1, 0x2]
movs r0, 0xA
@ -797,7 +797,7 @@ CheckMovementInputAcroBikeUnknownMode5: @ 8119764
lsrs r4, 16
lsls r5, 16
lsrs r5, 16
ldr r6, =gUnknown_02037590
ldr r6, =gPlayerAvatar
ldrb r1, [r6, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -836,7 +836,7 @@ CheckMovementInputAcroBikeUnknownMode6: @ 81197C0
lsrs r1, 16
lsls r2, 16
lsrs r2, 16
ldr r4, =gUnknown_02037590
ldr r4, =gPlayerAvatar
movs r3, 0
strb r3, [r4, 0x8]
bl CheckMovementInputAcroBike
@ -863,7 +863,7 @@ sub_81197F4: @ 81197F4
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -893,7 +893,7 @@ sub_8119830: @ 8119830
lsls r0, 24
lsrs r5, r0, 24
adds r6, r5, 0
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -961,7 +961,7 @@ sub_81198C0: @ 81198C0
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -990,7 +990,7 @@ sub_81198FC: @ 81198FC
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -1019,7 +1019,7 @@ sub_8119938: @ 8119938
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -1048,7 +1048,7 @@ sub_8119974: @ 8119974
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -1077,7 +1077,7 @@ sub_81199B0: @ 81199B0
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -1156,7 +1156,7 @@ _08119A50:
bl sub_81197F4
b _08119A84
_08119A58:
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
@ -1198,7 +1198,7 @@ sub_8119AA4: @ 8119AA4
lsls r0, 24
lsrs r4, r0, 24
adds r6, r4, 0
ldr r7, =gUnknown_02037590
ldr r7, =gPlayerAvatar
ldrb r1, [r7, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -1267,7 +1267,7 @@ sub_8119B34: @ 8119B34
lsls r0, 24
lsrs r4, r0, 24
adds r6, r4, 0
ldr r7, =gUnknown_02037590
ldr r7, =gPlayerAvatar
ldrb r1, [r7, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -1336,7 +1336,7 @@ sub_8119BC4: @ 8119BC4
lsls r0, 24
lsrs r4, r0, 24
adds r6, r4, 0
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -1396,7 +1396,7 @@ sub_8119C3C: @ 8119C3C
lsrs r3, r0, 16
lsls r1, 16
lsrs r2, r1, 16
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0]
movs r0, 0x4
ands r0, r1
@ -1421,7 +1421,7 @@ sub_8119C64: @ 8119C64
bl sub_8119DF8
lsls r0, 24
lsrs r2, r0, 24
ldr r4, =gUnknown_02037590
ldr r4, =gPlayerAvatar
ldr r0, [r4, 0xC]
movs r1, 0xF
ands r0, r1
@ -1443,7 +1443,7 @@ _08119C9A:
movs r0, 0xF
adds r2, r5, 0
ands r2, r0
ldr r4, =gUnknown_02037590
ldr r4, =gPlayerAvatar
ldr r0, [r4, 0x10]
movs r1, 0xF
ands r0, r1
@ -1532,7 +1532,7 @@ sub_8119D30: @ 8119D30
_08119D36:
ldr r0, =gUnknown_085974C0
adds r4, r5, r0
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldr r1, [r0, 0xC]
ldr r2, [r0, 0x10]
ldr r0, [r4, 0x8]
@ -1570,7 +1570,7 @@ _08119D7A:
sub_8119D80: @ 8119D80
push {r4,lr}
lsls r0, 24
ldr r3, =gUnknown_02037590
ldr r3, =gPlayerAvatar
ldr r2, [r3, 0xC]
lsls r2, 4
movs r1, 0xF0
@ -1604,7 +1604,7 @@ _08119D9C:
sub_8119DBC: @ 8119DBC
push {r4,lr}
lsls r0, 24
ldr r3, =gUnknown_02037590
ldr r3, =gPlayerAvatar
ldr r2, [r3, 0x10]
lsls r2, 4
movs r1, 0xF0
@ -1681,7 +1681,7 @@ sub_8119E38: @ 8119E38
adds r6, r0, 0
lsls r6, 24
lsrs r6, 24
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
@ -1922,7 +1922,7 @@ _08119FF2:
sub_8119FF8: @ 8119FF8
push {r4,lr}
sub sp, 0x4
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0]
movs r0, 0x18
ands r0, r1
@ -1966,7 +1966,7 @@ player_should_look_direction_be_enforced_upon_movement: @ 811A044
cmp r0, 0
beq _0811A078
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -1996,7 +1996,7 @@ GetOnOffBike: @ 811A080
ldr r1, =gUnknown_02037348
movs r0, 0
strb r0, [r1]
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0]
movs r0, 0x6
ands r0, r1
@ -2026,7 +2026,7 @@ _0811A0C4:
thumb_func_start sub_811A0D0
sub_811A0D0: @ 811A0D0
push {lr}
ldr r2, =gUnknown_02037590
ldr r2, =gPlayerAvatar
movs r3, 0
strb r3, [r2, 0x8]
strb r3, [r2, 0x9]
@ -2064,7 +2064,7 @@ _0811A0FA:
sub_811A114: @ 811A114
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02037590
ldr r2, =gPlayerAvatar
strb r0, [r2, 0xA]
lsrs r1, r0, 1
adds r0, r1
@ -2075,7 +2075,7 @@ sub_811A114: @ 811A114
thumb_func_start sub_811A128
sub_811A128: @ 811A128
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
movs r0, 0
strb r0, [r1, 0xA]
strb r0, [r1, 0xB]
@ -2091,7 +2091,7 @@ sub_811A138: @ 811A138
mov r0, sp
movs r2, 0x6
bl memcpy
ldr r2, =gUnknown_02037590
ldr r2, =gPlayerAvatar
ldrb r1, [r2]
movs r0, 0x2
ands r0, r1
@ -2130,7 +2130,7 @@ _0811A182:
sub_811A188: @ 811A188
push {r4,r5,lr}
sub sp, 0x4
ldr r5, =gUnknown_02037590
ldr r5, =gPlayerAvatar
ldrb r1, [r5]
movs r0, 0x4
ands r0, r1

4
asm/braille_puzzles.s
View File

@ -271,7 +271,7 @@ _0817982E:
sub_8179834: @ 8179834
push {lr}
bl brm_get_pokemon_selection
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@ -367,7 +367,7 @@ _08179912:
sub_8179918: @ 8179918
push {lr}
bl brm_get_pokemon_selection
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
lsls r0, 24
lsrs r0, 24
str r0, [r1]

2
asm/field_camera.s
View File

@ -1082,7 +1082,7 @@ CameraPanningCB_PanAhead: @ 808A360
b _0808A3FC
.pool
_0808A374:
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x3]
cmp r0, 0x1
bne _0808A394

6
asm/field_control_avatar.s
View File

@ -44,7 +44,7 @@ process_overworld_input: @ 809BF08
lsls r2, 16
lsrs r2, 16
mov r8, r2
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r6, [r0, 0x3]
ldrb r0, [r0, 0x2]
mov r9, r0
@ -567,7 +567,7 @@ _0809C32E:
.pool
_0809C33C:
movs r4, 0
ldr r1, =gUnknown_02032308
ldr r1, =gLinkPlayerMapObjects
_0809C340:
ldrb r0, [r1]
cmp r0, 0x1
@ -1368,7 +1368,7 @@ _0809CA04:
bl sub_80B215C
bl AdjustFriendship_step
bl sub_81D4998
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0]
movs r0, 0x40
ands r0, r1

146
asm/field_effect.s
View File

@ -1989,7 +1989,7 @@ task00_8084310: @ 80B6A24
cmp r0, 0
beq _080B6A8A
bl brm_get_pokemon_selection
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@ -2033,7 +2033,7 @@ mapldr_08084390: @ 80B6AA4
movs r1, 0
bl CreateTask
ldr r4, =gMapObjects
ldr r3, =gUnknown_02037590
ldr r3, =gPlayerAvatar
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -2163,7 +2163,7 @@ sub_80B6BCC: @ 80B6BCC
mov r5, r8
push {r5,r6}
mov r9, r0
ldr r6, =gUnknown_02037590
ldr r6, =gPlayerAvatar
ldrb r0, [r6, 0x5]
lsls r5, r0, 3
adds r5, r0
@ -2256,7 +2256,7 @@ _080B6C88:
sub_80B6C90: @ 80B6C90
push {r4-r6,lr}
adds r5, r0, 0
ldr r6, =gUnknown_02037590
ldr r6, =gPlayerAvatar
ldrb r0, [r6, 0x4]
lsls r2, r0, 4
adds r2, r0
@ -2309,7 +2309,7 @@ sub_80B6C90: @ 80B6C90
sub_80B6D04: @ 80B6D04
push {r4-r6,lr}
adds r4, r0, 0
ldr r2, =gUnknown_02037590
ldr r2, =gPlayerAvatar
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -2454,7 +2454,7 @@ _080B6E0E:
thumb_func_start sub_80B6E18
sub_80B6E18: @ 80B6E18
push {lr}
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
movs r0, 0
strb r0, [r1, 0x6]
bl ScriptContext2_Disable
@ -2551,7 +2551,7 @@ sub_80B6EC0: @ 80B6EC0
sub_80B6EE0: @ 80B6EE0
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -2664,7 +2664,7 @@ sub_80B6FA8: @ 80B6FA8
sub_80B6FB8: @ 80B6FB8
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x4]
lsls r4, r0, 4
adds r4, r0
@ -2702,7 +2702,7 @@ _080B6FF6:
sub_80B7004: @ 80B7004
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x4]
lsls r4, r0, 4
adds r4, r0
@ -2828,7 +2828,7 @@ sub_80B7114: @ 80B7114
sub sp, 0x4
adds r5, r0, 0
bl CameraObjectReset2
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
@ -2883,7 +2883,7 @@ _080B717E:
sub_80B7190: @ 80B7190
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x4]
lsls r4, r0, 4
adds r4, r0
@ -2914,7 +2914,7 @@ sub_80B7190: @ 80B7190
sub_80B71D0: @ 80B71D0
push {r4,r5,lr}
adds r4, r0, 0
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x4]
lsls r0, r1, 4
adds r0, r1
@ -2962,7 +2962,7 @@ _080B721E:
sub_80B7230: @ 80B7230
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x4]
lsls r4, r0, 4
adds r4, r0
@ -2993,7 +2993,7 @@ sub_80B7230: @ 80B7230
sub_80B7270: @ 80B7270
push {r4,r5,lr}
adds r4, r0, 0
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x4]
lsls r0, r1, 4
adds r0, r1
@ -3063,7 +3063,7 @@ _080B72EE:
thumb_func_start sub_80B72F4
sub_80B72F4: @ 80B72F4
push {r4,lr}
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -3111,7 +3111,7 @@ oei_waterfall: @ 80B734C
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r2, =gUnknown_02038C08
ldr r2, =gFieldEffectSpawnParams
ldr r2, [r2]
strh r2, [r1, 0xA]
bl _call_via_r4
@ -3138,7 +3138,7 @@ _080B7396:
ldrsh r2, [r4, r0]
lsls r2, 2
adds r2, r5
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r1, r0, 3
adds r1, r0
@ -3162,7 +3162,7 @@ sub_80B73D0: @ 80B73D0
push {r4,lr}
adds r4, r0, 0
bl ScriptContext2_Enable
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
movs r0, 0x1
strb r0, [r1, 0x6]
ldrh r0, [r4, 0x8]
@ -3188,7 +3188,7 @@ waterfall_1_do_anim_probably: @ 80B73F0
bne _080B7420
adds r0, r5, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
movs r2, 0xA
ldrsh r0, [r4, r2]
str r0, [r1]
@ -3268,7 +3268,7 @@ _080B748E:
cmp r4, 0
bne _080B74C4
bl ScriptContext2_Disable
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
strb r4, [r0, 0x6]
ldr r0, =sub_80B7384
bl FindTaskIdByFunc
@ -3304,7 +3304,7 @@ sub_80B74D0: @ 80B74D0
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r3, =gUnknown_02038C08
ldr r3, =gFieldEffectSpawnParams
ldr r2, [r3]
strh r2, [r1, 0x26]
ldr r2, [r3, 0x4]
@ -3347,7 +3347,7 @@ _080B751E:
thumb_func_start dive_1_lock
dive_1_lock: @ 80B7544
ldr r2, =gUnknown_02037590
ldr r2, =gPlayerAvatar
movs r1, 0x1
strb r1, [r2, 0x6]
ldrh r1, [r0, 0x8]
@ -3363,7 +3363,7 @@ dive_2_unknown: @ 80B7558
push {r4,lr}
adds r4, r0, 0
bl ScriptContext2_Enable
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
movs r2, 0x26
ldrsh r0, [r4, r2]
str r0, [r1]
@ -3393,7 +3393,7 @@ dive_3_unknown: @ 80B7580
cmp r0, 0
bne _080B75C4
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -3437,7 +3437,7 @@ sub_80B75F0: @ 80B75F0
lsrs r0, 24
ldr r6, =gUnknown_0855C438
ldr r2, =gTasks
ldr r5, =gUnknown_02037590
ldr r5, =gPlayerAvatar
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@ -3480,7 +3480,7 @@ sub_80B764C: @ 80B764C
bl CameraObjectReset2
movs r0, 0
bl SetCameraPanningCallback
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
movs r2, 0x1
strb r2, [r0, 0x6]
ldrb r0, [r5, 0x3]
@ -3536,7 +3536,7 @@ sub_80B76B8: @ 80B76B8
strh r0, [r2, 0x26]
movs r0, 0x1
strh r0, [r4, 0xE]
ldr r3, =gUnknown_02038C08
ldr r3, =gFieldEffectSpawnParams
movs r5, 0x10
ldrsh r0, [r1, r5]
str r0, [r3]
@ -3767,7 +3767,7 @@ sub_80B7890: @ 80B7890
lsrs r0, 24
ldr r6, =gUnknown_0855C450
ldr r2, =gTasks
ldr r5, =gUnknown_02037590
ldr r5, =gPlayerAvatar
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@ -3808,7 +3808,7 @@ sub_80B78EC: @ 80B78EC
adds r4, r1, 0
bl CameraObjectReset2
bl player_bitmagic
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
movs r0, 0x1
strb r0, [r1, 0x6]
ldrb r0, [r4, 0x1]
@ -3835,7 +3835,7 @@ sub_80B791C: @ 80B791C
lsls r0, 24
cmp r0, 0
beq _080B795C
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
movs r2, 0x10
ldrsh r0, [r5, r2]
str r0, [r1]
@ -3915,7 +3915,7 @@ sub_80B79BC: @ 80B79BC
lsls r0, 24
cmp r0, 0
beq _080B79E6
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
movs r0, 0
strb r0, [r1, 0x6]
bl ScriptContext2_Disable
@ -3935,7 +3935,7 @@ _080B79E6:
thumb_func_start sub_80B79F4
sub_80B79F4: @ 80B79F4
push {r4,lr}
ldr r4, =gUnknown_02038C08
ldr r4, =gFieldEffectSpawnParams
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@ -4016,7 +4016,7 @@ sub_80B7A8C: @ 80B7A8C
lsrs r0, 24
ldr r6, =gUnknown_0855C460
ldr r2, =gTasks
ldr r5, =gUnknown_02037590
ldr r5, =gPlayerAvatar
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@ -4057,7 +4057,7 @@ sub_80B7AE8: @ 80B7AE8
adds r4, r1, 0
bl player_bitmagic
bl CameraObjectReset2
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
movs r0, 0x1
strb r0, [r1, 0x6]
ldrb r0, [r4, 0x3]
@ -4090,7 +4090,7 @@ sub_80B7B18: @ 80B7B18
ldrsh r0, [r5, r2]
cmp r0, 0x3
ble _080B7B6C
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
movs r2, 0x10
ldrsh r0, [r4, r2]
str r0, [r1]
@ -4222,7 +4222,7 @@ _080B7C2C:
thumb_func_start sub_80B7C48
sub_80B7C48: @ 80B7C48
push {r4,lr}
ldr r4, =gUnknown_02038C08
ldr r4, =gFieldEffectSpawnParams
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@ -4359,7 +4359,7 @@ sub_80B7D34: @ 80B7D34
bl music_something
bl sub_80AF0B4
_080B7D60:
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -4466,7 +4466,7 @@ mapldr_080859D4: @ 80B7E48
movs r0, 0
str r0, [r1]
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -4537,7 +4537,7 @@ sub_80B7EE8: @ 80B7EE8
mov r0, sp
movs r2, 0x5
bl memcpy
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -4695,7 +4695,7 @@ sub_80B8034: @ 80B8034
mov r0, sp
movs r2, 0x5
bl memcpy
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -4765,7 +4765,7 @@ sub_80B80C4: @ 80B80C4
mov r0, sp
movs r2, 0x5
bl memcpy
ldr r2, =gUnknown_02037590
ldr r2, =gPlayerAvatar
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -4911,7 +4911,7 @@ mapldr_08085D88: @ 80B8200
movs r0, 0
str r0, [r1]
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -4961,7 +4961,7 @@ sub_80B8280: @ 80B8280
lsls r0, 24
cmp r0, 0
beq _080B82F6
ldr r5, =gUnknown_02037590
ldr r5, =gPlayerAvatar
ldrb r0, [r5, 0x4]
lsls r2, r0, 4
adds r2, r0
@ -5027,7 +5027,7 @@ sub_80B830C: @ 80B830C
mov r0, sp
movs r2, 0x5
bl memcpy
ldr r2, =gUnknown_02037590
ldr r2, =gPlayerAvatar
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -5156,7 +5156,7 @@ sub_80B8410: @ 80B8410
mov r0, sp
movs r2, 0x5
bl memcpy
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -5229,7 +5229,7 @@ _080B84BE:
bl CreateTask
lsls r0, 24
lsrs r4, r0, 24
ldr r2, =gUnknown_02038C08
ldr r2, =gFieldEffectSpawnParams
ldr r0, [r2]
ldr r1, [r2, 0x4]
ldr r2, [r2, 0x8]
@ -5252,7 +5252,7 @@ _080B84BE:
thumb_func_start sub_80B84F8
sub_80B84F8: @ 80B84F8
push {r4-r6,lr}
ldr r5, =gUnknown_02038C08
ldr r5, =gFieldEffectSpawnParams
ldr r0, [r5]
movs r6, 0x80
lsls r6, 24
@ -6292,7 +6292,7 @@ sub_80B8D44: @ 80B8D44
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r0, =gUnknown_02038C08
ldr r0, =gFieldEffectSpawnParams
ldr r0, [r0]
strh r0, [r1, 0x26]
bl sav1_reset_battle_music_maybe
@ -6335,7 +6335,7 @@ sub_80B8DB4: @ 80B8DB4
adds r4, r0, 0
bl ScriptContext2_Enable
bl player_bitmagic
ldr r5, =gUnknown_02037590
ldr r5, =gPlayerAvatar
movs r0, 0x1
strb r0, [r5, 0x6]
movs r0, 0x8
@ -6374,7 +6374,7 @@ sub_80B8DB4: @ 80B8DB4
sub_80B8E14: @ 80B8E14
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -6410,7 +6410,7 @@ _080B8E50:
sub_80B8E60: @ 80B8E60
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -6421,7 +6421,7 @@ sub_80B8E60: @ 80B8E60
lsls r0, 24
cmp r0, 0
beq _080B8E96
ldr r2, =gUnknown_02038C08
ldr r2, =gFieldEffectSpawnParams
movs r1, 0x26
ldrsh r0, [r4, r1]
movs r1, 0x80
@ -6449,7 +6449,7 @@ sub_80B8EA8: @ 80B8EA8
lsls r0, 24
cmp r0, 0
bne _080B8F12
ldr r5, =gUnknown_02037590
ldr r5, =gPlayerAvatar
ldrb r0, [r5, 0x5]
lsls r4, r0, 3
adds r4, r0
@ -6473,7 +6473,7 @@ sub_80B8EA8: @ 80B8EA8
lsrs r1, 24
adds r0, r4, 0
bl FieldObjectSetSpecialAnim
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
movs r2, 0xA
ldrsh r0, [r6, r2]
str r0, [r1]
@ -6498,7 +6498,7 @@ _080B8F12:
thumb_func_start sub_80B8F24
sub_80B8F24: @ 80B8F24
push {r4,r5,lr}
ldr r5, =gUnknown_02037590
ldr r5, =gPlayerAvatar
ldrb r1, [r5, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -6704,7 +6704,7 @@ sub_80B90CC: @ 80B90CC
strb r0, [r2, 0x5]
ldr r0, =sub_80B9128
str r0, [r2, 0x1C]
ldr r0, =gUnknown_02038C08
ldr r0, =gFieldEffectSpawnParams
ldr r0, [r0]
strh r0, [r2, 0x30]
movs r0, 0x9E
@ -6793,7 +6793,7 @@ sub_80B91A4: @ 80B91A4
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r0, =gUnknown_02038C08
ldr r0, =gFieldEffectSpawnParams
ldr r0, [r0]
strh r0, [r1, 0xA]
movs r0, 0
@ -6829,7 +6829,7 @@ sub_80B91D4: @ 80B91D4
sub_80B9204: @ 80B9204
push {r4-r6,lr}
adds r5, r0, 0
ldr r6, =gUnknown_02037590
ldr r6, =gPlayerAvatar
ldrb r1, [r6, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -6870,7 +6870,7 @@ _080B924C:
sub_80B925C: @ 80B925C
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -6884,7 +6884,7 @@ sub_80B925C: @ 80B925C
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
movs r2, 0xA
ldrsh r0, [r4, r2]
str r0, [r1]
@ -6906,7 +6906,7 @@ sub_80B92A0: @ 80B92A0
lsls r0, 24
cmp r0, 0
bne _080B92E8
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -6955,7 +6955,7 @@ sub_80B92F8: @ 80B92F8
strh r0, [r4, 0xC]
movs r0, 0x1
bl SetPlayerAvatarTransitionFlags
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -6975,7 +6975,7 @@ _080B932C:
sub_80B933C: @ 80B933C
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -7023,7 +7023,7 @@ sub_80B9390: @ 80B9390
asrs r0, 16
cmp r0, 0x7
ble _080B9406
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -7087,7 +7087,7 @@ sub_80B9418: @ 80B9418
asrs r0, 16
cmp r0, 0x9
ble _080B9464
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
@ -7582,7 +7582,7 @@ sub_80B97D4: @ 80B97D4
sub_80B9804: @ 80B9804
push {r4-r6,lr}
adds r5, r0, 0
ldr r6, =gUnknown_02037590
ldr r6, =gPlayerAvatar
ldrb r1, [r6, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -7673,7 +7673,7 @@ sub_80B98B8: @ 80B98B8
cmp r0, 0
bne _080B9910
_080B98D0:
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -7720,7 +7720,7 @@ sub_80B9924: @ 80B9924
mov r0, sp
movs r2, 0x24
bl memcpy
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x4]
lsls r1, r0, 4
adds r1, r0
@ -7760,7 +7760,7 @@ sub_80B9978: @ 80B9978
lsls r0, 24
cmp r0, 0
beq _080B99DC
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r5, r0, 3
adds r5, r0
@ -7810,7 +7810,7 @@ _080B99DC:
sub_80B99F0: @ 80B99F0
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -7872,7 +7872,7 @@ sub_80B9A60: @ 80B9A60
lsls r0, 16
cmp r0, 0
bne _080B9ACA
ldr r6, =gUnknown_02037590
ldr r6, =gPlayerAvatar
ldrb r1, [r6, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -7922,7 +7922,7 @@ _080B9ACA:
sub_80B9ADC: @ 80B9ADC
push {r4,lr}
sub sp, 0x4
ldr r4, =gUnknown_02038C08
ldr r4, =gFieldEffectSpawnParams
ldrb r0, [r4]
ldrb r1, [r4, 0x4]
ldrb r2, [r4, 0x8]
@ -8343,7 +8343,7 @@ _080B9E24:
sub_80B9E28: @ 80B9E28
push {r4-r7,lr}
sub sp, 0x4
ldr r7, =gUnknown_02038C08
ldr r7, =gFieldEffectSpawnParams
ldrb r0, [r7]
ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8]

62
asm/field_effect_helpers.s
View File

@ -574,7 +574,7 @@ _0815432E:
thumb_func_start oei_shadow
oei_shadow: @ 8154340
push {r4,r5,lr}
ldr r5, =gUnknown_02038C08
ldr r5, =gFieldEffectSpawnParams
ldrb r0, [r5]
ldrb r1, [r5, 0x4]
ldrb r2, [r5, 0x8]
@ -742,7 +742,7 @@ _08154498:
oei_grass_normal: @ 81544AC
push {r4,r5,lr}
sub sp, 0x4
ldr r5, =gUnknown_02038C08
ldr r5, =gFieldEffectSpawnParams
ldrh r1, [r5]
mov r0, sp
strh r1, [r0]
@ -827,7 +827,7 @@ unc_grass_normal: @ 8154550
lsrs r4, r0, 8
lsls r0, 24
lsrs r7, r0, 24
ldr r3, =gUnknown_02037334
ldr r3, =gCamera
ldrb r1, [r3]
movs r0, 0x1
ands r0, r1
@ -951,7 +951,7 @@ _08154648:
thumb_func_start sub_8154658
sub_8154658: @ 8154658
push {r4,lr}
ldr r4, =gUnknown_02038C08
ldr r4, =gFieldEffectSpawnParams
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@ -1080,7 +1080,7 @@ _0815474C:
sub_8154758: @ 8154758
push {r4,r5,lr}
sub sp, 0x4
ldr r5, =gUnknown_02038C08
ldr r5, =gFieldEffectSpawnParams
ldrh r1, [r5]
mov r0, sp
strh r1, [r0]
@ -1166,7 +1166,7 @@ unc_grass_tall: @ 8154800
lsrs r7, r0, 8
lsls r0, 24
lsrs r6, r0, 24
ldr r3, =gUnknown_02037334
ldr r3, =gCamera
ldrb r1, [r3]
movs r0, 0x1
ands r0, r1
@ -1282,7 +1282,7 @@ _081548EA:
thumb_func_start sub_81548FC
sub_81548FC: @ 81548FC
push {r4,lr}
ldr r4, =gUnknown_02038C08
ldr r4, =gFieldEffectSpawnParams
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@ -1336,7 +1336,7 @@ _08154958:
thumb_func_start sub_815496C
sub_815496C: @ 815496C
push {r4-r6,lr}
ldr r6, =gUnknown_02038C08
ldr r6, =gFieldEffectSpawnParams
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
@ -1537,7 +1537,7 @@ _08154AF2:
thumb_func_start sub_8154B04
sub_8154B04: @ 8154B04
push {r4,lr}
ldr r4, =gUnknown_02038C08
ldr r4, =gFieldEffectSpawnParams
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@ -1591,7 +1591,7 @@ _08154B62:
thumb_func_start sub_8154B78
sub_8154B78: @ 8154B78
push {r4,r5,lr}
ldr r4, =gUnknown_02038C08
ldr r4, =gFieldEffectSpawnParams
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@ -1646,7 +1646,7 @@ _08154BD8:
thumb_func_start sub_8154BEC
sub_8154BEC: @ 8154BEC
push {r4,r5,lr}
ldr r4, =gUnknown_02038C08
ldr r4, =gFieldEffectSpawnParams
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@ -1777,7 +1777,7 @@ _08154CE4:
thumb_func_start sub_8154CEC
sub_8154CEC: @ 8154CEC
push {r4-r6,lr}
ldr r6, =gUnknown_02038C08
ldr r6, =gFieldEffectSpawnParams
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
@ -1922,7 +1922,7 @@ _08154E0A:
thumb_func_start sub_8154E1C
sub_8154E1C: @ 8154E1C
push {r4,lr}
ldr r4, =gUnknown_02038C08
ldr r4, =gFieldEffectSpawnParams
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@ -1976,7 +1976,7 @@ _08154E78:
thumb_func_start oei_water_drop_tall
oei_water_drop_tall: @ 8154E8C
push {r4,lr}
ldr r4, =gUnknown_02038C08
ldr r4, =gFieldEffectSpawnParams
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@ -2030,7 +2030,7 @@ _08154EE8:
thumb_func_start sub_8154EFC
sub_8154EFC: @ 8154EFC
push {r4-r7,lr}
ldr r7, =gUnknown_02038C08
ldr r7, =gFieldEffectSpawnParams
ldrb r0, [r7]
ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8]
@ -2193,7 +2193,7 @@ oei_ripples: @ 8155054
push {r4,lr}
ldr r0, =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x14]
ldr r4, =gUnknown_02038C08
ldr r4, =gFieldEffectSpawnParams
movs r2, 0
ldrsh r1, [r4, r2]
movs r3, 0x4
@ -2238,7 +2238,7 @@ _081550A0:
thumb_func_start sub_81550B4
sub_81550B4: @ 81550B4
push {r4-r6,lr}
ldr r6, =gUnknown_02038C08
ldr r6, =gFieldEffectSpawnParams
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
@ -2393,7 +2393,7 @@ _081551E4:
thumb_func_start sub_81551F0
sub_81551F0: @ 81551F0
push {r4,lr}
ldr r4, =gUnknown_02038C08
ldr r4, =gFieldEffectSpawnParams
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@ -2445,7 +2445,7 @@ _08155248:
thumb_func_start sub_815525C
sub_815525C: @ 815525C
push {r4,lr}
ldr r4, =gUnknown_02038C08
ldr r4, =gFieldEffectSpawnParams
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@ -2497,7 +2497,7 @@ _081552B4:
thumb_func_start sub_81552C8
sub_81552C8: @ 81552C8
push {r4,lr}
ldr r4, =gUnknown_02038C08
ldr r4, =gFieldEffectSpawnParams
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@ -2549,7 +2549,7 @@ _08155320:
thumb_func_start sub_8155334
sub_8155334: @ 8155334
push {r4,lr}
ldr r4, =gUnknown_02038C08
ldr r4, =gFieldEffectSpawnParams
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@ -2603,7 +2603,7 @@ ash: @ 81553A0
push {r4,lr}
lsls r2, 16
lsrs r2, 16
ldr r4, =gUnknown_02038C08
ldr r4, =gFieldEffectSpawnParams
lsls r0, 16
asrs r0, 16
str r0, [r4]
@ -2630,7 +2630,7 @@ ash: @ 81553A0
oei_ash: @ 81553D4
push {r4,r5,lr}
sub sp, 0x4
ldr r5, =gUnknown_02038C08
ldr r5, =gFieldEffectSpawnParams
ldrh r1, [r5]
mov r0, sp
strh r1, [r0]
@ -2766,7 +2766,7 @@ sub_81554AC: @ 81554AC
ldrsh r1, [r4, r2]
bl CurrentMapDrawMetatileAt
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -2809,7 +2809,7 @@ _0815552C:
thumb_func_start sub_8155534
sub_8155534: @ 8155534
push {r4,r5,lr}
ldr r4, =gUnknown_02038C08
ldr r4, =gFieldEffectSpawnParams
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@ -3261,7 +3261,7 @@ _08155888:
thumb_func_start sub_8155890
sub_8155890: @ 8155890
push {r4,lr}
ldr r4, =gUnknown_02038C08
ldr r4, =gFieldEffectSpawnParams
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@ -3315,7 +3315,7 @@ _081558EC:
thumb_func_start sub_8155900
sub_8155900: @ 8155900
push {r4-r7,lr}
ldr r7, =gUnknown_02038C08
ldr r7, =gFieldEffectSpawnParams
ldrb r0, [r7]
ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8]
@ -3505,7 +3505,7 @@ _08155A76:
thumb_func_start sub_8155A88
sub_8155A88: @ 8155A88
push {r4,lr}
ldr r4, =gUnknown_02038C08
ldr r4, =gFieldEffectSpawnParams
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@ -3586,7 +3586,7 @@ _08155B20:
thumb_func_start sub_8155B2C
sub_8155B2C: @ 8155B2C
push {r4,lr}
ldr r4, =gUnknown_02038C08
ldr r4, =gFieldEffectSpawnParams
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@ -3689,7 +3689,7 @@ ShowDisguiseFieldEffect: @ 8155BD0
lsrs r6, r1, 24
lsls r2, 24
lsrs r7, r2, 24
ldr r5, =gUnknown_02038C08
ldr r5, =gFieldEffectSpawnParams
ldrb r0, [r5]
ldrb r1, [r5, 0x4]
ldrb r2, [r5, 0x8]
@ -3950,7 +3950,7 @@ _08155DD8:
thumb_func_start sub_8155DDC
sub_8155DDC: @ 8155DDC
push {r4,lr}
ldr r4, =gUnknown_02038C08
ldr r4, =gFieldEffectSpawnParams
ldr r0, [r4]
adds r0, 0x7
str r0, [r4]

24
asm/field_ground_effect.s
View File

@ -1166,7 +1166,7 @@ _08096E8C:
@ void GroundEffect_SpawnOnTallGrass(struct npc_state *fieldObject, struct obj *object)
GroundEffect_SpawnOnTallGrass: @ 8096E90
push {lr}
ldr r3, =gUnknown_02038C08
ldr r3, =gFieldEffectSpawnParams
movs r2, 0x10
ldrsh r1, [r0, r2]
str r1, [r3]
@ -1205,7 +1205,7 @@ GroundEffect_SpawnOnTallGrass: @ 8096E90
@ void GroundEffect_StepOnTallGrass(struct npc_state *fieldObject, struct obj *object)
GroundEffect_StepOnTallGrass: @ 8096EDC
push {lr}
ldr r3, =gUnknown_02038C08
ldr r3, =gFieldEffectSpawnParams
movs r2, 0x10
ldrsh r1, [r0, r2]
str r1, [r3]
@ -1244,7 +1244,7 @@ GroundEffect_StepOnTallGrass: @ 8096EDC
@ void GroundEffect_SpawnOnLongGrass(struct npc_state *fieldObject, struct obj *object)
GroundEffect_SpawnOnLongGrass: @ 8096F28
push {lr}
ldr r3, =gUnknown_02038C08
ldr r3, =gFieldEffectSpawnParams
movs r2, 0x10
ldrsh r1, [r0, r2]
str r1, [r3]
@ -1283,7 +1283,7 @@ GroundEffect_SpawnOnLongGrass: @ 8096F28
@ void GroundEffect_StepOnLongGrass(struct npc_state *fieldObject, struct obj *object)
GroundEffect_StepOnLongGrass: @ 8096F74
push {lr}
ldr r3, =gUnknown_02038C08
ldr r3, =gFieldEffectSpawnParams
movs r2, 0x10
ldrsh r1, [r0, r2]
str r1, [r3]
@ -1413,7 +1413,7 @@ DoTracksGroundEffect_Footprints: @ 8097044
mov r0, sp
movs r2, 0x4
bl memcpy
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
movs r2, 0x14
ldrsh r0, [r5, r2]
str r0, [r1]
@ -1449,7 +1449,7 @@ DoTracksGroundEffect_BikeTireTracks: @ 8097094
ldr r0, [r4, 0x14]
cmp r1, r0
beq _080970D6
ldr r2, =gUnknown_02038C08
ldr r2, =gFieldEffectSpawnParams
movs r1, 0x14
ldrsh r0, [r4, r1]
str r0, [r2]
@ -1520,7 +1520,7 @@ GroundEffect_JumpOnTallGrass: @ 8097110
sub sp, 0x4
adds r5, r0, 0
adds r6, r1, 0
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
movs r2, 0x10
ldrsh r0, [r5, r2]
str r0, [r1]
@ -1562,7 +1562,7 @@ _0809715A:
@ void GroundEffect_JumpOnLongGrass(struct npc_state *fieldObject, struct obj *object)
GroundEffect_JumpOnLongGrass: @ 8097168
push {lr}
ldr r2, =gUnknown_02038C08
ldr r2, =gFieldEffectSpawnParams
movs r3, 0x10
ldrsh r1, [r0, r3]
str r1, [r2]
@ -1585,7 +1585,7 @@ GroundEffect_JumpOnLongGrass: @ 8097168
@ void GroundEffect_JumpOnShallowWater(struct npc_state *fieldObject, struct obj *object)
GroundEffect_JumpOnShallowWater: @ 8097190
push {r4,lr}
ldr r3, =gUnknown_02038C08
ldr r3, =gFieldEffectSpawnParams
movs r4, 0x10
ldrsh r2, [r0, r4]
str r2, [r3]
@ -1611,7 +1611,7 @@ GroundEffect_JumpOnShallowWater: @ 8097190
@ void GroundEffect_JumpOnWater(struct npc_state *fieldObject, struct obj *object)
GroundEffect_JumpOnWater: @ 80971C0
push {r4,lr}
ldr r3, =gUnknown_02038C08
ldr r3, =gFieldEffectSpawnParams
movs r4, 0x10
ldrsh r2, [r0, r4]
str r2, [r3]
@ -1637,7 +1637,7 @@ GroundEffect_JumpOnWater: @ 80971C0
@ void GroundEffect_JumpLandingDust(struct npc_state *fieldObject, struct obj *object)
GroundEffect_JumpLandingDust: @ 80971F0
push {r4,lr}
ldr r3, =gUnknown_02038C08
ldr r3, =gFieldEffectSpawnParams
movs r4, 0x10
ldrsh r2, [r0, r4]
str r2, [r3]
@ -1685,7 +1685,7 @@ GroundEffect_HotSprings: @ 8097230
@ void GroundEffect_Seaweed(struct npc_state *fieldObject, struct obj *object)
GroundEffect_Seaweed: @ 8097240
push {lr}
ldr r2, =gUnknown_02038C08
ldr r2, =gFieldEffectSpawnParams
movs r3, 0x10
ldrsh r1, [r0, r3]
str r1, [r2]

20270
asm/field_map_obj.s
View File

File diff suppressed because it is too large Load Diff

168
asm/field_player_avatar.s
View File

@ -43,7 +43,7 @@ player_step: @ 808A9C0
lsrs r7, r1, 16
lsls r2, 16
lsrs r6, r2, 16
ldr r4, =gUnknown_02037590
ldr r4, =gPlayerAvatar
ldrb r1, [r4, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -153,7 +153,7 @@ npc_clear_strange_bits: @ 808AA9C
adds r2, 0x2
ands r1, r2
strb r1, [r0, 0x1]
ldr r2, =gUnknown_02037590
ldr r2, =gPlayerAvatar
ldrb r1, [r2]
movs r0, 0x7F
ands r0, r1
@ -172,7 +172,7 @@ MovePlayerAvatarUsingKeypadInput: @ 808AAC0
lsrs r4, r1, 16
lsls r2, 16
lsrs r2, 16
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0]
movs r0, 0x6
ands r0, r1
@ -197,7 +197,7 @@ _0808AAF0:
@ void PlayerAllowForcedMovementIfMovingSameDirection()
PlayerAllowForcedMovementIfMovingSameDirection: @ 808AAF8
push {lr}
ldr r2, =gUnknown_02037590
ldr r2, =gPlayerAvatar
ldrb r0, [r2, 0x2]
cmp r0, 0x2
bne _0808AB0A
@ -234,7 +234,7 @@ TryDoMetatileBehaviorForcedMovment: @ 808AB14
@ u8 GetForcedMovementByMetatileBehavior()
GetForcedMovementByMetatileBehavior: @ 808AB38
push {r4-r6,lr}
ldr r3, =gUnknown_02037590
ldr r3, =gPlayerAvatar
ldrb r1, [r3]
movs r0, 0x20
ands r0, r1
@ -280,7 +280,7 @@ _0808AB8C:
thumb_func_start ForcedMovement_None
ForcedMovement_None: @ 808AB94
push {r4,lr}
ldr r4, =gUnknown_02037590
ldr r4, =gPlayerAvatar
ldrb r1, [r4]
movs r0, 0x40
ands r0, r1
@ -325,7 +325,7 @@ DoForcedMovement: @ 808ABE0
mov r9, r1
lsls r0, 24
lsrs r5, r0, 24
ldr r6, =gUnknown_02037590
ldr r6, =gPlayerAvatar
adds r0, r5, 0
bl CheckForPlayerAvatarCollision
lsls r0, 24
@ -381,7 +381,7 @@ _0808AC48:
DoForcedMovementInCurrentDirection: @ 808AC58
push {lr}
adds r1, r0, 0
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r2, [r0, 0x5]
lsls r0, r2, 3
adds r0, r2
@ -523,7 +523,7 @@ ForcedMovement_Slide: @ 808AD60
push {r4,lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02037590
ldr r2, =gPlayerAvatar
ldrb r3, [r2, 0x5]
lsls r2, r3, 3
adds r2, r3
@ -618,7 +618,7 @@ ForcedMovement_0xBC: @ 808AE04
thumb_func_start ForcedMovement_MuddySlope
ForcedMovement_MuddySlope: @ 808AE10
push {r4,lr}
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -691,7 +691,7 @@ CheckMovementInputNotOnBike: @ 808AE98
lsrs r4, r0, 24
cmp r4, 0
bne _0808AEB0
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
strb r4, [r0, 0x2]
movs r0, 0
b _0808AED2
@ -702,7 +702,7 @@ _0808AEB0:
lsrs r0, 24
cmp r4, r0
beq _0808AECC
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
ldrb r0, [r1, 0x2]
cmp r0, 0x2
beq _0808AECC
@ -710,7 +710,7 @@ _0808AEB0:
b _0808AED0
.pool
_0808AECC:
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
movs r0, 0x2
_0808AED0:
strb r0, [r1, 0x2]
@ -784,7 +784,7 @@ _0808AF3C:
bl PlayerNotOnBikeCollide
b _0808AFB6
_0808AF4E:
ldr r4, =gUnknown_02037590
ldr r4, =gPlayerAvatar
ldrb r1, [r4]
movs r0, 0x8
ands r0, r1
@ -843,7 +843,7 @@ CheckForPlayerAvatarCollision: @ 808AFBC
adds r6, r0, 0
lsls r6, 24
lsrs r6, 24
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
@ -894,7 +894,7 @@ sub_808B028: @ 808B028
adds r6, r0, 0
lsls r6, 24
lsrs r6, 24
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
@ -1102,7 +1102,7 @@ sub_808B1BC: @ 808B1BC
lsrs r4, r1, 16
lsls r2, 24
lsrs r6, r2, 24
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0]
movs r0, 0x8
ands r0, r1
@ -1285,7 +1285,7 @@ IsPlayerCollidingWithFarawayIslandMew: @ 808B324
sub sp, 0x4
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
ldrb r2, [r1, 0x5]
lsls r1, r2, 3
adds r1, r2
@ -1369,7 +1369,7 @@ SetPlayerAvatarTransitionFlags: @ 808B3CC
push {lr}
lsls r0, 16
lsrs r0, 16
ldr r2, =gUnknown_02037590
ldr r2, =gPlayerAvatar
ldrb r1, [r2, 0x1]
orrs r0, r1
strb r0, [r2, 0x1]
@ -1383,7 +1383,7 @@ SetPlayerAvatarTransitionFlags: @ 808B3CC
@ void DoPlayerAvatarTransition()
DoPlayerAvatarTransition: @ 808B3E8
push {r4,r5,lr}
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r4, [r0, 0x1]
cmp r4, 0
beq _0808B428
@ -1396,7 +1396,7 @@ _0808B3F4:
ldr r0, =gUnknown_084974B8
lsls r2, r5, 2
adds r2, r0
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -1412,7 +1412,7 @@ _0808B416:
lsrs r4, 1
cmp r5, 0x7
bls _0808B3F4
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
movs r0, 0
strb r0, [r1, 0x1]
_0808B428:
@ -1522,14 +1522,14 @@ PlayerAvatarTransition_Surfing: @ 808B4D8
bl FieldObjectTurn
movs r0, 0x8
bl SetPlayerAvatarStateMask
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
movs r2, 0x10
ldrsh r0, [r4, r2]
str r0, [r1]
movs r2, 0x12
ldrsh r0, [r4, r2]
str r0, [r1, 0x4]
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
str r0, [r1, 0x8]
movs r0, 0x8
@ -1574,7 +1574,7 @@ PlayerAvatarTransition_Underwater: @ 808B534
thumb_func_start PlayerAvatarTransition_ReturnToField
@ void PlayerAvatarTransition_ReturnToField(struct npc_state *fieldObject)
PlayerAvatarTransition_ReturnToField: @ 808B568
ldr r2, =gUnknown_02037590
ldr r2, =gPlayerAvatar
ldrb r1, [r2]
movs r0, 0x20
orrs r0, r1
@ -1586,7 +1586,7 @@ PlayerAvatarTransition_ReturnToField: @ 808B568
thumb_func_start sub_808B578
sub_808B578: @ 808B578
push {r4,lr}
ldr r4, =gUnknown_02037590
ldr r4, =gPlayerAvatar
movs r0, 0
strb r0, [r4, 0x3]
bl PlayerIsAnimActive
@ -1622,7 +1622,7 @@ _0808B5B6:
player_is_anim_in_certain_ranges: @ 808B5BC
push {lr}
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -1673,7 +1673,7 @@ sub_808B618: @ 808B618
lsls r0, 24
cmp r0, 0
beq _0808B634
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x2]
cmp r0, 0x1
beq _0808B634
@ -1691,7 +1691,7 @@ _0808B636:
@ bool8 PlayerIsAnimActive()
PlayerIsAnimActive: @ 808B63C
push {lr}
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -1710,7 +1710,7 @@ PlayerIsAnimActive: @ 808B63C
@ bool8 PlayerCheckIfAnimFinishedOrInactive()
PlayerCheckIfAnimFinishedOrInactive: @ 808B660
push {lr}
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -1728,7 +1728,7 @@ PlayerCheckIfAnimFinishedOrInactive: @ 808B660
thumb_func_start player_set_x22
player_set_x22: @ 808B684
ldr r3, =gMapObjects
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
ldrb r2, [r1, 0x5]
lsls r1, r2, 3
adds r1, r2
@ -1743,7 +1743,7 @@ player_set_x22: @ 808B684
thumb_func_start player_get_x22
player_get_x22: @ 808B6A0
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -1761,7 +1761,7 @@ sub_808B6BC: @ 808B6BC
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r2, [r0, 0x5]
lsls r0, r2, 3
adds r0, r2
@ -1788,7 +1788,7 @@ player_npc_set_state_and_x22_etc: @ 808B6E4
bne _0808B712
adds r0, r4, 0
bl player_set_x22
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -2002,7 +2002,7 @@ PlayerJumpLedge: @ 808B840
thumb_func_start sub_808B864
sub_808B864: @ 808B864
push {r4,lr}
ldr r4, =gUnknown_02037590
ldr r4, =gPlayerAvatar
ldrb r0, [r4, 0x3]
cmp r0, 0x2
beq _0808B872
@ -2220,7 +2220,7 @@ PlayCollisionSoundIfNotFacingWarp: @ 808B9EC
lsls r0, 24
lsrs r4, r0, 24
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -2276,7 +2276,7 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 808BA68
adds r4, r0, 0
adds r5, r1, 0
ldr r3, =gMapObjects
ldr r2, =gUnknown_02037590
ldr r2, =gPlayerAvatar
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -2308,7 +2308,7 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 808BA68
PlayerGetDestCoords: @ 808BAAC
push {r4,r5,lr}
ldr r5, =gMapObjects
ldr r4, =gUnknown_02037590
ldr r4, =gPlayerAvatar
ldrb r3, [r4, 0x5]
lsls r2, r3, 3
adds r2, r3
@ -2334,7 +2334,7 @@ plaer_get_pos_including_state_based_drift: @ 808BADC
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -2466,7 +2466,7 @@ _0808BC30:
@ u8 player_get_direction_lower_nybble()
player_get_direction_lower_nybble: @ 808BC38
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -2483,7 +2483,7 @@ player_get_direction_lower_nybble: @ 808BC38
@ u8 player_get_direction_upper_nybble()
player_get_direction_upper_nybble: @ 808BC58
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -2499,7 +2499,7 @@ player_get_direction_upper_nybble: @ 808BC58
@ u8 PlayerGetZCoord()
PlayerGetZCoord: @ 808BC74
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -2516,7 +2516,7 @@ sub_808BC90: @ 808BC90
push {lr}
adds r3, r0, 0
adds r2, r1, 0
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -2537,7 +2537,7 @@ sub_808BC90: @ 808BC90
thumb_func_start TestPlayerAvatarFlags
@ u32 TestPlayerAvatarFlags(u32 mask)
TestPlayerAvatarFlags: @ 808BCC0
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
ldrb r1, [r1]
ands r1, r0
adds r0, r1, 0
@ -2547,7 +2547,7 @@ TestPlayerAvatarFlags: @ 808BCC0
thumb_func_start sub_808BCD0
sub_808BCD0: @ 808BCD0
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0]
bx lr
.pool
@ -2556,7 +2556,7 @@ sub_808BCD0: @ 808BCD0
thumb_func_start GetPlayerAvatarObjectId
@ u8 GetPlayerAvatarObjectId()
GetPlayerAvatarObjectId: @ 808BCDC
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x4]
bx lr
.pool
@ -2573,7 +2573,7 @@ sub_808BCE8: @ 808BCE8
thumb_func_start sub_808BCF4
sub_808BCF4: @ 808BCF4
push {r4,lr}
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
@ -2659,7 +2659,7 @@ GetPlayerAvatarGraphicsIdByStateId: @ 808BD8C
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
ldrb r1, [r1, 0x7]
bl GetPlayerAvatarGraphicsIdByStateIdAndGender
lsls r0, 24
@ -2804,7 +2804,7 @@ _0808BE70:
IsPlayerFacingSurfableFishableWater: @ 808BE74
push {r4,r5,lr}
sub sp, 0x4
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
@ -2871,7 +2871,7 @@ _0808BEF6:
@ void ClearPlayerAvatarInfo()
ClearPlayerAvatarInfo: @ 808BF00
push {lr}
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
movs r1, 0
movs r2, 0x24
bl memset
@ -2885,7 +2885,7 @@ ClearPlayerAvatarInfo: @ 808BF00
SetPlayerAvatarStateMask: @ 808BF14
lsls r0, 24
lsrs r0, 24
ldr r3, =gUnknown_02037590
ldr r3, =gPlayerAvatar
ldrb r2, [r3]
movs r1, 0xE0
ands r1, r2
@ -2937,7 +2937,7 @@ _0808BF64:
@ u8 GetPlayerAvatarGraphicsIdByCurrentState()
GetPlayerAvatarGraphicsIdByCurrentState: @ 808BF6C
push {r4-r6,lr}
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r5, [r0]
movs r2, 0
ldr r3, =gUnknown_0849750C
@ -2980,7 +2980,7 @@ SetPlayerAvatarExtraStateTransition: @ 808BFB0
lsrs r0, 24
lsls r4, 24
lsrs r4, 24
ldr r5, =gUnknown_02037590
ldr r5, =gPlayerAvatar
ldrb r1, [r5, 0x7]
bl GetPlayerAvatarStateTransitionByGraphicsId
lsls r0, 24
@ -3072,7 +3072,7 @@ InitPlayerAvatar: @ 808BFE0
mov r1, r9
bl FieldObjectTurn
bl ClearPlayerAvatarInfo
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
strb r6, [r0, 0x2]
strb r6, [r0, 0x3]
strb r5, [r0, 0x5]
@ -3098,7 +3098,7 @@ sub_808C0A8: @ 808C0A8
lsls r0, 24
lsrs r4, r0, 24
ldr r6, =gMapObjects
ldr r5, =gUnknown_02037590
ldr r5, =gPlayerAvatar
ldrb r0, [r5, 0x5]
lsls r1, r0, 3
adds r1, r0
@ -3147,7 +3147,7 @@ _0808C100:
thumb_func_start sub_808C114
sub_808C114: @ 808C114
push {r4,r5,lr}
ldr r5, =gUnknown_02037590
ldr r5, =gPlayerAvatar
ldrb r0, [r5, 0x5]
lsls r4, r0, 3
adds r4, r0
@ -3181,7 +3181,7 @@ sub_808C15C: @ 808C15C
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
ldr r6, =gUnknown_02037590
ldr r6, =gPlayerAvatar
ldrb r0, [r6, 0x5]
lsls r4, r0, 3
adds r4, r0
@ -3222,7 +3222,7 @@ sub_808C1B4: @ 808C1B4
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
ldr r6, =gUnknown_02037590
ldr r6, =gPlayerAvatar
ldrb r0, [r6, 0x5]
lsls r4, r0, 3
adds r4, r0
@ -3271,7 +3271,7 @@ sub_808C228: @ 808C228
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
ldr r6, =gUnknown_02037590
ldr r6, =gPlayerAvatar
ldrb r0, [r6, 0x5]
lsls r4, r0, 3
adds r4, r0
@ -3424,7 +3424,7 @@ _0808C360:
ldrsh r3, [r4, r0]
lsls r3, 2
adds r3, r6
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r1, r0, 3
adds r1, r0
@ -3453,7 +3453,7 @@ sub_808C3A4: @ 808C3A4
push {r4,lr}
adds r4, r0, 0
bl ScriptContext2_Enable
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
movs r0, 0x1
strb r0, [r1, 0x6]
ldrh r0, [r4, 0x8]
@ -3517,7 +3517,7 @@ _0808C3F0:
lsrs r1, 24
adds r0, r4, 0
bl FieldObjectSetSpecialAnim
ldr r2, =gUnknown_02038C08
ldr r2, =gFieldEffectSpawnParams
movs r1, 0x10
ldrsh r0, [r4, r1]
str r0, [r2]
@ -3571,7 +3571,7 @@ sub_808C484: @ 808C484
bl FieldObjectClearAnimIfSpecialAnimFinished
adds r0, r5, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
movs r0, 0
strb r0, [r1, 0x6]
bl ScriptContext2_Disable
@ -3620,7 +3620,7 @@ _0808C50A:
ldrsh r2, [r4, r0]
lsls r2, 2
adds r2, r5
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r1, r0, 3
adds r1, r0
@ -3644,7 +3644,7 @@ sub_808C544: @ 808C544
push {r4-r6,lr}
adds r6, r0, 0
adds r4, r1, 0
ldr r5, =gUnknown_02037590
ldr r5, =gPlayerAvatar
movs r0, 0x1
strb r0, [r5, 0x6]
adds r0, r4, 0
@ -3721,7 +3721,7 @@ _0808C5E2:
ldrsh r2, [r4, r0]
lsls r2, 2
adds r2, r5
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r1, r0, 3
adds r1, r0
@ -3749,7 +3749,7 @@ sub_808C61C: @ 808C61C
ldrb r1, [r1, 0x18]
lsrs r1, 4
strh r1, [r0, 0xA]
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
movs r0, 0x1
strb r0, [r1, 0x6]
bl ScriptContext2_Enable
@ -3873,7 +3873,7 @@ sub_808C6FC: @ 808C6FC
adds r0, r5, 0
bl FieldObjectSetSpecialAnim
bl ScriptContext2_Disable
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
movs r0, 0
strb r0, [r1, 0x6]
ldr r0, =sub_808C5D0
@ -3898,7 +3898,7 @@ sub_808C750: @ 808C750
bl ScriptContext2_Enable
bl sav1_reset_battle_music_maybe
bl sub_8085898
ldr r2, =gUnknown_02037590
ldr r2, =gPlayerAvatar
ldrb r1, [r2]
movs r0, 0xF7
ands r0, r1
@ -3931,7 +3931,7 @@ taskFF_0805D1D4: @ 808C7A8
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -3978,7 +3978,7 @@ sub_808C814: @ 808C814
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r6, =gUnknown_02037590
ldr r6, =gPlayerAvatar
ldrb r1, [r6, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -4083,7 +4083,7 @@ fish0: @ 808C8F8
push {r4,lr}
adds r4, r0, 0
bl ScriptContext2_Enable
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
movs r0, 0x1
strb r0, [r1, 0x6]
ldrh r0, [r4, 0x8]
@ -4128,7 +4128,7 @@ fish1: @ 808C918
adds r1, r0
strh r1, [r5, 0x22]
ldr r3, =gMapObjects
ldr r2, =gUnknown_02037590
ldr r2, =gPlayerAvatar
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -4366,7 +4366,7 @@ _0808CB30:
_0808CB32:
cmp r6, 0x1
bne _0808CB5C
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x4]
lsls r4, r0, 4
adds r4, r0
@ -4574,7 +4574,7 @@ _0808CCBC:
lsrs r6, r0, 16
cmp r6, 0
bne _0808CD50
ldr r7, =gUnknown_02037590
ldr r7, =gPlayerAvatar
ldrb r0, [r7, 0x5]
lsls r4, r0, 3
adds r4, r0
@ -4633,7 +4633,7 @@ _0808CD50:
cmp r0, 0
beq _0808CD80
_0808CD58:
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
movs r0, 0
strb r0, [r1, 0x6]
bl ScriptContext2_Disable
@ -4664,7 +4664,7 @@ fishB: @ 808CD94
sub sp, 0x10
adds r5, r0, 0
bl sub_808CF78
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x4]
lsls r4, r0, 4
adds r4, r0
@ -4712,7 +4712,7 @@ fishC: @ 808CE04
sub sp, 0x10
adds r5, r0, 0
bl sub_808CF78
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x4]
lsls r4, r0, 4
adds r4, r0
@ -4777,7 +4777,7 @@ fishE: @ 808CE8C
adds r6, r0, 0
bl sub_808CF78
ldr r7, =gSprites
ldr r5, =gUnknown_02037590
ldr r5, =gPlayerAvatar
ldrb r0, [r5, 0x4]
lsls r1, r0, 4
adds r1, r0
@ -4855,7 +4855,7 @@ fishF: @ 808CF2C
lsrs r1, r0, 16
cmp r1, 0
bne _0808CF68
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
strb r1, [r0, 0x6]
bl ScriptContext2_Disable
bl sub_809757C
@ -4879,7 +4879,7 @@ _0808CF68:
thumb_func_start sub_808CF78
sub_808CF78: @ 808CF78
push {r4-r7,lr}
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x4]
lsls r0, r1, 4
adds r0, r1
@ -4978,7 +4978,7 @@ _0808D02A:
movs r0, 0x8
strh r0, [r4, 0x26]
_0808D03A:
ldr r3, =gUnknown_02037590
ldr r3, =gPlayerAvatar
ldrb r1, [r3]
movs r0, 0x8
ands r0, r1
@ -5032,7 +5032,7 @@ sub_808D094: @ 808D094
lsls r0, 24
lsrs r0, 24
adds r2, r0, 0
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -5212,7 +5212,7 @@ sub_808D1FC: @ 808D1FC
lsls r0, 24
lsrs r0, 24
mov r8, r0
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1

2
asm/field_tasks.s
View File

@ -1858,7 +1858,7 @@ _0809E6F8:
cmp r6, 0xD
ble _0809E6F8
_0809E708:
ldr r2, =gUnknown_02037334
ldr r2, =gCamera
ldrb r1, [r2]
movs r0, 0x1
ands r0, r1

14
asm/fieldmap.s
View File

@ -1508,12 +1508,12 @@ CameraMove: @ 808887C
push {r5-r7}
mov r10, r0
mov r9, r1
ldr r1, =gUnknown_02037334
ldr r1, =gCamera
ldrb r0, [r1]
movs r1, 0x2
negs r1, r1
ands r1, r0
ldr r2, =gUnknown_02037334
ldr r2, =gCamera
strb r1, [r2]
mov r0, r10
mov r1, r9
@ -1556,23 +1556,23 @@ _080888C4:
ldrb r0, [r4, 0x8]
ldrb r1, [r4, 0x9]
bl mliX_load_map
ldr r1, =gUnknown_02037334
ldr r1, =gCamera
ldrb r0, [r1]
movs r1, 0x1
orrs r0, r1
ldr r2, =gUnknown_02037334
ldr r2, =gCamera
strb r0, [r2]
ldr r0, =gSaveBlock1Ptr
ldr r1, [r0]
movs r2, 0
ldrsh r0, [r1, r2]
subs r5, r0
ldr r0, =gUnknown_02037334
ldr r0, =gCamera
str r5, [r0, 0x4]
movs r2, 0x2
ldrsh r0, [r1, r2]
subs r6, r0
ldr r0, =gUnknown_02037334
ldr r0, =gCamera
str r6, [r0, 0x8]
ldrh r0, [r1]
add r0, r10
@ -1583,7 +1583,7 @@ _080888C4:
mov r0, r8
bl sub_80885C4
_08088932:
ldr r0, =gUnknown_02037334
ldr r0, =gCamera
ldrb r0, [r0]
lsls r0, 31
lsrs r0, 31

54
asm/fldeff_80F9BCC.s
View File

@ -480,13 +480,13 @@ sub_80F9F5C: @ 80F9F5C
thumb_func_start sub_80F9F78
sub_80F9F78: @ 80F9F78
push {lr}
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0]
movs r0, 0x6
ands r0, r1
cmp r0, 0
beq _080F9FC0
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
ldr r0, [r1, 0x4]
cmp r0, 0x2
beq _080F9FAE
@ -517,7 +517,7 @@ _080F9FB6:
movs r0, 0x18
b _080F9FFC
_080F9FC0:
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
ldr r0, [r1, 0x4]
cmp r0, 0x2
beq _080F9FEA
@ -643,7 +643,7 @@ _080FA0C4:
sub_80FA0DC: @ 80FA0DC
push {lr}
bl brm_get_pokemon_selection
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@ -692,7 +692,7 @@ sub_80FA13C: @ 80FA13C
bl sub_80F9F78
ldr r0, =gUnknown_0858E600
ldr r3, =gSprites
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
ldrb r1, [r1, 0x4]
lsls r2, r1, 4
adds r2, r1
@ -701,7 +701,7 @@ sub_80FA13C: @ 80FA13C
ldrh r1, [r2, 0x2]
lsls r1, 23
lsrs r1, 23
ldr r4, =gUnknown_02038C08
ldr r4, =gFieldEffectSpawnParams
ldr r3, [r4, 0x14]
adds r1, r3
lsls r1, 16
@ -778,7 +778,7 @@ sub_80FA1D8: @ 80FA1D8
sub_80FA1E8: @ 80FA1E8
push {lr}
bl brm_get_pokemon_selection
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@ -836,20 +836,20 @@ sub_80FA248: @ 80FA248
ands r2, r0
cmp r2, 0x96
bne _080FA26A
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
movs r0, 0
str r0, [r1, 0x1C]
_080FA26A:
cmp r2, 0x9C
bne _080FA274
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
movs r0, 0x2
str r0, [r1, 0x1C]
_080FA274:
bl sub_80F9F78
ldr r0, =gUnknown_0858E618
ldr r3, =gSprites
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
ldrb r1, [r1, 0x4]
lsls r2, r1, 4
adds r2, r1
@ -858,7 +858,7 @@ _080FA274:
ldrh r1, [r2, 0x2]
lsls r1, 23
lsrs r1, 23
ldr r4, =gUnknown_02038C08
ldr r4, =gFieldEffectSpawnParams
ldr r3, [r4, 0x14]
adds r1, r3
lsls r1, 16
@ -891,7 +891,7 @@ sub_80FA2D8: @ 80FA2D8
adds r4, r0, 0
movs r0, 0x9B
bl PlaySE
ldr r0, =gUnknown_02038C08
ldr r0, =gFieldEffectSpawnParams
ldr r1, [r0, 0x1C]
adds r2, r4, 0
adds r2, 0x2A
@ -917,7 +917,7 @@ sub_80FA304: @ 80FA304
asrs r0, 16
cmp r0, 0x27
ble _080FA32E
ldr r0, =gUnknown_02038C08
ldr r0, =gFieldEffectSpawnParams
ldr r0, [r0, 0x1C]
cmp r0, 0
beq _080FA322
@ -951,7 +951,7 @@ sub_80FA33C: @ 80FA33C
sub_80FA34C: @ 80FA34C
push {lr}
bl brm_get_pokemon_selection
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@ -1000,7 +1000,7 @@ sub_80FA3AC: @ 80FA3AC
bl sub_80F9F78
ldr r0, =gUnknown_0858E630
ldr r3, =gSprites
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
ldrb r1, [r1, 0x4]
lsls r2, r1, 4
adds r2, r1
@ -1009,7 +1009,7 @@ sub_80FA3AC: @ 80FA3AC
ldrh r1, [r2, 0x2]
lsls r1, 23
lsrs r1, 23
ldr r4, =gUnknown_02038C08
ldr r4, =gFieldEffectSpawnParams
ldr r3, [r4, 0x14]
adds r1, r3
lsls r1, 16
@ -1723,7 +1723,7 @@ sub_80FA9D0: @ 80FA9D0
push {r4,lr}
sub sp, 0x4
ldr r3, =gMapObjects
ldr r2, =gUnknown_02037590
ldr r2, =gPlayerAvatar
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -1807,7 +1807,7 @@ sub_80FAA7C: @ 80FAA7C
mov r0, sp
adds r1, r4, 0
bl GetXYCoordsOneStepInFrontOfPlayer
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
mov r0, sp
movs r2, 0
ldrsh r0, [r0, r2]
@ -1835,7 +1835,7 @@ _080FAABC:
_080FAAC6:
ldr r0, =gUnknown_0858E68C
ldr r3, =gSprites
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
ldrb r1, [r1, 0x4]
lsls r2, r1, 4
adds r2, r1
@ -1857,7 +1857,7 @@ _080FAAC6:
_080FAAFC:
ldr r0, =gUnknown_0858E68C
ldr r3, =gSprites
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
ldrb r1, [r1, 0x4]
lsls r2, r1, 4
adds r2, r1
@ -1876,7 +1876,7 @@ _080FAAFC:
_080FAB2C:
ldr r0, =gUnknown_0858E68C
ldr r3, =gSprites
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
ldrb r1, [r1, 0x4]
lsls r2, r1, 4
adds r2, r1
@ -1898,7 +1898,7 @@ _080FAB4C:
_080FAB64:
ldr r0, =gUnknown_0858E68C
ldr r3, =gSprites
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
ldrb r1, [r1, 0x4]
lsls r2, r1, 4
adds r2, r1
@ -1930,7 +1930,7 @@ door_restore_tilemap: @ 80FABA4
adds r5, r0, 0
movs r0, 0x83
bl PlaySE
ldr r4, =gUnknown_02038C08
ldr r4, =gFieldEffectSpawnParams
ldr r0, [r4, 0x14]
ldr r1, [r4, 0x18]
subs r1, 0x1
@ -1953,7 +1953,7 @@ _080FABDC:
lsls r2, 2
bl MapGridSetMetatileIdAt
_080FABEA:
ldr r4, =gUnknown_02038C08
ldr r4, =gFieldEffectSpawnParams
ldr r0, [r4, 0x14]
ldr r1, [r4, 0x18]
ldr r2, =0x0000020a
@ -1988,7 +1988,7 @@ sub_80FAC24: @ 80FAC24
strh r0, [r5, 0x2E]
b _080FAC54
_080FAC38:
ldr r4, =gUnknown_02038C08
ldr r4, =gFieldEffectSpawnParams
ldr r0, [r4, 0x14]
ldr r1, [r4, 0x18]
ldr r2, =0x00000e8c
@ -2307,7 +2307,7 @@ sub_80FAEF0: @ 80FAEF0
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -2357,7 +2357,7 @@ sub_80FAF64: @ 80FAF64
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1

6
asm/fldeff_cut.s
View File

@ -385,7 +385,7 @@ hm2_ruin_valley: @ 80D3A50
movs r0, 0x1
bl FieldEffectStart
bl brm_get_pokemon_selection
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@ -421,7 +421,7 @@ sub_80D3A6C: @ 80D3A6C
sub_80D3A9C: @ 80D3A9C
push {lr}
bl brm_get_pokemon_selection
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@ -542,7 +542,7 @@ _080D3B64:
movs r6, 0
ldr r5, =gSprites
_080D3BA0:
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x4]
lsls r0, r1, 4
adds r0, r1

4
asm/fldeff_emotion.s
View File

@ -115,7 +115,7 @@ sub_80B46D8: @ 80B46D8
orrs r3, r4
mov r4, r12
strb r3, [r4]
ldr r4, =gUnknown_02038C08
ldr r4, =gFieldEffectSpawnParams
ldr r3, [r4]
strh r3, [r0, 0x2E]
ldr r3, [r4, 0x4]
@ -296,7 +296,7 @@ sub_80B4808: @ 80B4808
b _080B489E
.pool
_080B4870:
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1

2
asm/fldeff_groundshake.s
View File

@ -235,7 +235,7 @@ sub_81BE808: @ 81BE808
ldrh r1, [r0, 0x26]
adds r1, 0x4
strh r1, [r0, 0x26]
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r1, r0, 3
adds r1, r0

4
asm/fldeff_strength.s
View File

@ -40,7 +40,7 @@ _08145DF2:
sub_8145E0C: @ 8145E0C
push {lr}
bl brm_get_pokemon_selection
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@ -66,7 +66,7 @@ sub_8145E2C: @ 8145E2C
lsrs r0, r2, 16
strh r0, [r1, 0x18]
strh r2, [r1, 0x1A]
ldr r0, =gUnknown_02038C08
ldr r0, =gFieldEffectSpawnParams
ldr r1, [r0]
movs r0, 0x64
muls r0, r1

4
asm/fldeff_sweetscent.s
View File

@ -24,7 +24,7 @@ hm2_sweet_scent: @ 8159F10
movs r0, 0x33
bl FieldEffectStart
bl brm_get_pokemon_selection
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@ -217,4 +217,4 @@ _0815A0BE:
thumb_func_end sub_815A090
.align 2, 0 @ Don't pad with nop.

2
asm/fldeff_teleport.s
View File

@ -39,7 +39,7 @@ hm_teleport_run_dp02scr: @ 817C8FC
movs r0, 0x3F
bl FieldEffectStart
bl brm_get_pokemon_selection
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
lsls r0, 24
lsrs r0, 24
str r0, [r1]

4
asm/link.s
View File

@ -27235,7 +27235,7 @@ sub_8017940: @ 8017940
ldrsh r0, [r4, r1]
cmp r0, 0x8
bne _08017978
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x3]
cmp r0, 0x2
beq _0801796E
@ -31141,7 +31141,7 @@ bgid_upload_textbox_1: @ 8019938
thumb_func_start is_walking_or_running
is_walking_or_running: @ 8019958
push {lr}
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x3]
cmp r0, 0x2
beq _08019966

26
asm/map_obj_8097404.s
View File

@ -97,7 +97,7 @@ _0809749A:
lsls r0, 31
cmp r0, 0
beq _080974B8
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
cmp r4, r0
beq _080974B8
@ -133,7 +133,7 @@ _080974DA:
lsls r0, 31
cmp r0, 0
beq _080974FC
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
cmp r4, r0
beq _080974FC
@ -769,16 +769,16 @@ _08097964:
.pool
thumb_func_end sub_80978E4
thumb_func_start sub_8097978
@ void sub_8097978(struct obj *object, u16 a2)
sub_8097978: @ 8097978
thumb_func_start SetFieldObjectStepTimer
@ void SetFieldObjectStepTimer(struct obj *object, u16 a2)
SetFieldObjectStepTimer: @ 8097978
strh r1, [r0, 0x34]
bx lr
thumb_func_end sub_8097978
thumb_func_end SetFieldObjectStepTimer
thumb_func_start sub_809797C
@ bool8 sub_809797C(struct obj *object)
sub_809797C: @ 809797C
thumb_func_start RunFieldObjectStepTimer
@ bool8 RunFieldObjectStepTimer(struct obj *object)
RunFieldObjectStepTimer: @ 809797C
push {lr}
ldrh r1, [r0, 0x34]
subs r1, 0x1
@ -793,7 +793,7 @@ _0809798E:
_08097990:
pop {r1}
bx r1
thumb_func_end sub_809797C
thumb_func_end RunFieldObjectStepTimer
thumb_func_start obj_anim_image_set_and_seek
obj_anim_image_set_and_seek: @ 8097994
@ -1396,7 +1396,7 @@ oe_exec_and_other_stuff: @ 8097DD0
adds r0, r1, 0
lsls r4, 24
lsrs r4, 24
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
@ -1434,7 +1434,7 @@ DoRippleFieldEffect: @ 8097E14
adds r4, r1, 0
ldrb r0, [r0, 0x5]
bl GetFieldObjectGraphicsInfo
ldr r2, =gUnknown_02038C08
ldr r2, =gFieldEffectSpawnParams
movs r3, 0x20
ldrsh r1, [r4, r3]
str r1, [r2]
@ -1771,7 +1771,7 @@ _08098082:
lsls r0, 31
cmp r0, 0
beq _080980A8
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
cmp r4, r0
beq _080980A8

2
asm/map_obj_lock.s
View File

@ -8,7 +8,7 @@
thumb_func_start walkrun_is_standing_still
walkrun_is_standing_still: @ 8098388
push {lr}
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x3]
cmp r0, 0x1
beq _0809839C

10
asm/party_menu.s
View File

@ -10051,7 +10051,7 @@ task_launch_hm_phase_2: @ 81B5750
cmp r0, 0x1
bne _081B577C
bl brm_get_selected_species
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
lsls r0, 16
lsrs r0, 16
str r0, [r1]
@ -10135,7 +10135,7 @@ _081B57FE:
hm_surf_run_dp02scr: @ 81B5804
push {lr}
bl brm_get_pokemon_selection
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@ -10239,7 +10239,7 @@ sub_81B58A8: @ 81B58A8
hm2_waterfall: @ 81B58D4
push {lr}
bl brm_get_pokemon_selection
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@ -10299,7 +10299,7 @@ _081B594E:
sub_81B5958: @ 81B5958
push {lr}
bl brm_get_pokemon_selection
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@ -10314,7 +10314,7 @@ sub_81B5958: @ 81B5958
sub_81B5974: @ 81B5974
push {lr}
bl sub_809D1E8
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
lsls r0, 24
lsrs r0, 24
str r0, [r1, 0x4]

2
asm/pokemon_item_effect.s
View File

@ -1157,7 +1157,7 @@ _0806C6AE:
movs r2, 0
bl dp01_build_cmdbuf_x00_a_b_0
ldrb r0, [r4]
bl dp01_battle_side_mark_buffer_for_execution
bl MarkBufferBankForExecution
strb r5, [r4]
b _0806C6EC
.pool

22
asm/pokenav.s
View File

@ -26636,7 +26636,7 @@ sub_81D427C: @ 81D427C
ldr r2, =gMapObjects
adds r5, r1, r2
ldr r4, =gUnknown_030012F8
ldr r3, =gUnknown_02037590
ldr r3, =gPlayerAvatar
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -26672,7 +26672,7 @@ _081D42CA:
cmp r0, 0x3
bls _081D42CA
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -26730,7 +26730,7 @@ _081D4360:
ldr r6, =gMapObjects
mov r10, r6
_081D4368:
ldr r3, =gUnknown_02037590
ldr r3, =gPlayerAvatar
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -26837,7 +26837,7 @@ _081D4410:
beq _081D4446
b _081D45AA
_081D4446:
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -26879,7 +26879,7 @@ _081D4488:
cmp r0, 0
bne _081D4538
_081D449E:
ldr r2, =gUnknown_02037590
ldr r2, =gPlayerAvatar
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -26983,7 +26983,7 @@ _081D4540:
beq _081D4576
b _081D447C
_081D4576:
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -27152,7 +27152,7 @@ _081D46D0:
cmp r0, 0
bne _081D476E
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -27177,7 +27177,7 @@ _081D46D0:
b _081D447C
_081D470C:
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -27231,7 +27231,7 @@ _081D476E:
cmp r0, 0
bne _081D480C
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -27256,7 +27256,7 @@ _081D476E:
b _081D45AA
_081D47AA:
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -27327,7 +27327,7 @@ sub_81D4834: @ 81D4834
lsls r1, 16
lsrs r4, r1, 16
ldr r3, =gMapObjects
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
ldrb r2, [r1, 0x5]
lsls r1, r2, 3
adds r1, r2

2
asm/porthole.s
View File

@ -232,7 +232,7 @@ sub_80FB768: @ 80FB768
push {lr}
bl sub_80FB6EC
ldr r2, =gMapObjects
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1

2
asm/recorded_battle.s
View File

@ -2599,7 +2599,7 @@ _081863A2:
ldr r2, [sp, 0x40]
bl SetMonData
_081863CA:
ldr r2, =gUnknown_02024274
ldr r2, =gChosenMovesByBanks
ldr r3, [sp, 0x44]
adds r2, r3, r2
ldr r0, =gBattleStruct

64
asm/reset_save_heap.s
View File

@ -1,64 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_81700F8
sub_81700F8: @ 81700F8
push {r4,r5,lr}
ldr r5, =0x04000208
ldrh r4, [r5]
movs r0, 0
strh r0, [r5]
movs r0, 0x1
bl RegisterRamReset
movs r0, 0
movs r1, 0x80
bl ClearGpuRegBits
strh r4, [r5]
ldr r1, =gMain
ldr r0, =0x00000439
adds r1, r0
ldrb r2, [r1]
movs r0, 0x3
negs r0, r0
ands r0, r2
strb r0, [r1]
bl sub_815355C
lsls r0, 16
lsrs r0, 16
bl SetSaveBlocksPointers
bl sub_808447C
bl ResetSaveCounters
movs r0, 0
bl sub_81534D0
ldr r0, =gSaveFileStatus
ldrh r0, [r0]
cmp r0, 0
beq _08170148
cmp r0, 0x2
bne _0817014C
_08170148:
bl Sav2_ClearSetDefault
_0817014C:
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x15]
lsls r0, 31
lsrs r0, 31
bl SetPokemonCryStereo
ldr r0, =0x02000000
movs r1, 0xE0
lsls r1, 9
bl InitHeap
ldr r0, =sub_8086230
bl SetMainCallback2
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81700F8
.align 2, 0 @ Don't pad with nop.

10
asm/rom3.s
View File

@ -1573,7 +1573,7 @@ _08033346:
ldrsh r1, [r0, r2]
ldr r0, [r4]
adds r1, r0
ldr r0, =gUnknown_0202420E
ldr r0, =gEffectBank
ldrb r0, [r0]
strb r0, [r1, 0x7]
movs r2, 0
@ -2084,7 +2084,7 @@ _080337D2:
adds r0, r1
ldrb r0, [r0, 0x6]
strb r0, [r2]
ldr r2, =gUnknown_0202420E
ldr r2, =gEffectBank
movs r4, 0x26
ldrsh r0, [r5, r4]
adds r0, r1
@ -2175,8 +2175,8 @@ dp01_build_cmdbuf_x01_a_b_0: @ 80338D8
.pool
thumb_func_end dp01_build_cmdbuf_x01_a_b_0
thumb_func_start dp01_build_cmdbuf_x02_a_b_varargs
dp01_build_cmdbuf_x02_a_b_varargs: @ 8033900
thumb_func_start EmitSetAttributes
EmitSetAttributes: @ 8033900
push {r4-r6,lr}
ldr r4, [sp, 0x10]
lsls r0, 24
@ -2209,7 +2209,7 @@ _0803392E:
pop {r0}
bx r0
.pool
thumb_func_end dp01_build_cmdbuf_x02_a_b_varargs
thumb_func_end EmitSetAttributes
thumb_func_start sub_8033940
sub_8033940: @ 8033940

30
asm/rom4.s
View File

@ -4396,7 +4396,7 @@ sub_8086A68: @ 8086A68
sub_8086A80: @ 8086A80
push {lr}
ldr r2, =gMapObjects
ldr r3, =gUnknown_02037590
ldr r3, =gPlayerAvatar
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -5480,7 +5480,7 @@ sub_80872D8: @ 80872D8
movs r0, 0x1
_080872EA:
strb r0, [r6, 0x1]
ldr r1, =gUnknown_02032308
ldr r1, =gLinkPlayerMapObjects
lsls r0, r4, 2
adds r0, r1
ldrb r0, [r0, 0x3]
@ -5977,7 +5977,7 @@ sub_80876C4: @ 80876C4
thumb_func_start strange_npc_table_clear
strange_npc_table_clear: @ 80876CC
push {lr}
ldr r0, =gUnknown_02032308
ldr r0, =gLinkPlayerMapObjects
movs r1, 0
movs r2, 0x10
bl memset
@ -6025,7 +6025,7 @@ sub_80876F0: @ 80876F0
lsls r6, 24
lsrs r6, 24
lsls r4, r7, 2
ldr r0, =gUnknown_02032308
ldr r0, =gLinkPlayerMapObjects
adds r4, r0
lsls r5, r6, 3
adds r5, r6
@ -6118,7 +6118,7 @@ sub_80877DC: @ 80877DC
lsls r0, 24
lsls r1, 24
lsrs r2, r1, 24
ldr r1, =gUnknown_02032308
ldr r1, =gLinkPlayerMapObjects
lsrs r0, 22
adds r1, r0, r1
ldrb r0, [r1]
@ -6142,7 +6142,7 @@ sub_808780C: @ 808780C
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 22
ldr r1, =gUnknown_02032308
ldr r1, =gLinkPlayerMapObjects
adds r5, r0, r1
ldrb r1, [r5, 0x2]
lsls r0, r1, 3
@ -6176,7 +6176,7 @@ _08087838:
thumb_func_start sub_8087858
sub_8087858: @ 8087858
lsls r0, 24
ldr r1, =gUnknown_02032308
ldr r1, =gLinkPlayerMapObjects
lsrs r0, 22
adds r0, r1
ldrb r1, [r0, 0x2]
@ -6193,7 +6193,7 @@ sub_8087858: @ 8087858
thumb_func_start sub_8087878
sub_8087878: @ 8087878
lsls r0, 24
ldr r3, =gUnknown_02032308
ldr r3, =gLinkPlayerMapObjects
lsrs r0, 22
adds r0, r3
ldrb r3, [r0, 0x2]
@ -6213,7 +6213,7 @@ sub_8087878: @ 8087878
thumb_func_start sub_80878A0
sub_80878A0: @ 80878A0
lsls r0, 24
ldr r1, =gUnknown_02032308
ldr r1, =gLinkPlayerMapObjects
lsrs r0, 22
adds r0, r1
ldrb r1, [r0, 0x2]
@ -6230,7 +6230,7 @@ sub_80878A0: @ 80878A0
thumb_func_start sub_80878C0
sub_80878C0: @ 80878C0
lsls r0, 24
ldr r1, =gUnknown_02032308
ldr r1, =gLinkPlayerMapObjects
lsrs r0, 22
adds r0, r1
ldrb r1, [r0, 0x2]
@ -6249,7 +6249,7 @@ sub_80878C0: @ 80878C0
thumb_func_start sub_80878E4
sub_80878E4: @ 80878E4
lsls r0, 24
ldr r1, =gUnknown_02032308
ldr r1, =gLinkPlayerMapObjects
lsrs r0, 22
adds r0, r1
ldrb r1, [r0, 0x2]
@ -6271,7 +6271,7 @@ sub_80878E4: @ 80878E4
sub_808790C: @ 808790C
push {r4-r6,lr}
movs r2, 0
ldr r5, =gUnknown_02032308
ldr r5, =gLinkPlayerMapObjects
lsls r0, 16
asrs r4, r0, 16
lsls r1, 16
@ -6326,7 +6326,7 @@ sub_808796C: @ 808796C
lsrs r3, r1, 24
adds r2, r3, 0
lsrs r0, 22
ldr r1, =gUnknown_02032308
ldr r1, =gLinkPlayerMapObjects
adds r5, r0, r1
ldrb r1, [r5, 0x2]
lsls r0, r1, 3
@ -6654,7 +6654,7 @@ sub_8087BCC: @ 8087BCC
lsls r1, 24
lsrs r3, r1, 24
lsls r2, r5, 2
ldr r0, =gUnknown_02032308
ldr r0, =gLinkPlayerMapObjects
adds r2, r0
ldrb r1, [r2, 0x2]
lsls r0, r1, 3
@ -6742,7 +6742,7 @@ sub_8087C8C: @ 8087C8C
movs r0, 0x2E
ldrsh r4, [r5, r0]
lsls r4, 2
ldr r0, =gUnknown_02032308
ldr r0, =gLinkPlayerMapObjects
adds r4, r0
ldrb r1, [r4, 0x2]
lsls r0, r1, 3

18
asm/rom6.s
View File

@ -68,7 +68,7 @@ task08_080C9820: @ 813549C
lsrs r5, r0, 24
adds r6, r5, 0
bl ScriptContext2_Enable
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
movs r0, 0x1
strb r0, [r1, 0x6]
ldrb r1, [r1, 0x5]
@ -127,7 +127,7 @@ sub_813552C: @ 813552C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -167,7 +167,7 @@ sub_8135578: @ 8135578
cmp r4, 0
bne _081355FC
bl player_get_direction_lower_nybble
ldr r6, =gUnknown_02038C08
ldr r6, =gFieldEffectSpawnParams
lsls r0, 24
lsrs r0, 24
str r0, [r6, 0x4]
@ -191,7 +191,7 @@ _081355B0:
movs r0, 0x3
str r0, [r6, 0x8]
_081355B8:
ldr r5, =gUnknown_02037590
ldr r5, =gPlayerAvatar
ldrb r0, [r5, 0x5]
lsls r4, r0, 3
adds r4, r0
@ -244,7 +244,7 @@ sub_813561C: @ 813561C
ldrh r0, [r0, 0x1A]
orrs r1, r0
bl _call_via_r1
ldr r1, =gUnknown_02037590
ldr r1, =gPlayerAvatar
movs r0, 0
strb r0, [r1, 0x6]
adds r0, r4, 0
@ -303,7 +303,7 @@ _081356AC:
sub_81356C4: @ 81356C4
push {lr}
bl brm_get_pokemon_selection
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@ -380,7 +380,7 @@ hm2_dig: @ 8135760
movs r0, 0x26
bl FieldEffectStart
bl brm_get_pokemon_selection
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@ -3381,7 +3381,7 @@ hm2_flash: @ 8137178
lsls r4, 24
lsrs r4, 24
bl brm_get_pokemon_selection
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@ -11039,7 +11039,7 @@ _0813B0F8:
ldr r0, =sub_813B160
movs r1, 0x8
bl CreateTask
ldr r3, =gUnknown_02038C08
ldr r3, =gFieldEffectSpawnParams
movs r0, 0x1
str r0, [r3]
movs r0, 0x3A

2
asm/scrcmd.s
View File

@ -4874,7 +4874,7 @@ s9D_set_HM_animation_data: @ 809B7F4
lsls r0, 16
lsrs r0, 16
bl VarGet
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
lsls r4, 2
adds r4, r1
lsls r0, 16

2
asm/secret_base.s
View File

@ -751,7 +751,7 @@ sub_80E90C8: @ 80E90C8
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1

10
asm/trainer_see.s
View File

@ -734,7 +734,7 @@ sub_80B417C: @ 80B417C
push {r4,r5,lr}
adds r5, r1, 0
adds r4, r2, 0
ldr r1, =gUnknown_02038C08
ldr r1, =gFieldEffectSpawnParams
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
@ -882,7 +882,7 @@ _080B427A:
bl sub_808F23C
adds r0, r5, 0
bl sub_808F208
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -901,7 +901,7 @@ _080B427A:
beq _080B4308
_080B42D2:
bl sub_808BCE8
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
@ -936,7 +936,7 @@ sub_80B4318: @ 80B4318
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r0, =gUnknown_02037590
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@ -1050,7 +1050,7 @@ sub_80B43E0: @ 80B43E0
lsls r0, 24
cmp r0, 0
beq _080B4426
ldr r2, =gUnknown_02038C08
ldr r2, =gFieldEffectSpawnParams
movs r1, 0x10
ldrsh r0, [r4, r1]
str r0, [r2]

146
data/battle_scripts_1.s
View File

@ -21,7 +21,7 @@ gUnknown_082D8CD4:: @ 82D8CD4
gUnknown_082D8D65:: @ 82D8D65
.incbin "baserom.gba", 0x2d8d65, 0x6fd
gUnknown_082D9462:: @ 82D9462
BattleScript_MoveUsedMustRecharge:: @ 82D9462
.incbin "baserom.gba", 0x2d9462, 0xa7f
gUnknown_082D9EE1:: @ 82D9EE1
@ -120,16 +120,16 @@ gUnknown_082DACFA:: @ 82DACFA
gUnknown_082DAD0B:: @ 82DAD0B
.incbin "baserom.gba", 0x2dad0b, 0xa
gUnknown_082DAD15:: @ 82DAD15
BattleScript_LeechSeedTurnDrain:: @ 82DAD15
.incbin "baserom.gba", 0x2dad15, 0x5c
gUnknown_082DAD71:: @ 82DAD71
BattleScript_BideStoringEnergy:: @ 82DAD71
.incbin "baserom.gba", 0x2dad71, 0xb
gUnknown_082DAD7C:: @ 82DAD7C
BattleScript_BideAttack:: @ 82DAD7C
.incbin "baserom.gba", 0x2dad7c, 0x48
gUnknown_082DADC4:: @ 82DADC4
BattleScript_BideNoEnergyToAttack:: @ 82DADC4
.incbin "baserom.gba", 0x2dadc4, 0x14
gUnknown_082DADD8:: @ 82DADD8
@ -141,19 +141,19 @@ gUnknown_082DAE03:: @ 82DAE03
gUnknown_082DAE0D:: @ 82DAE0D
.incbin "baserom.gba", 0x2dae0d, 0x7
gUnknown_082DAE14:: @ 82DAE14
BattleScript_MoveUsedIsDisabled:: @ 82DAE14
.incbin "baserom.gba", 0x2dae14, 0xb
gUnknown_082DAE1F:: @ 82DAE1F
.incbin "baserom.gba", 0x2dae1f, 0x4
gUnknown_082DAE23:: @ 82DAE23
BattleScript_DisabledNoMore:: @ 82DAE23
.incbin "baserom.gba", 0x2dae23, 0x7
gUnknown_082DAE2A:: @ 82DAE2A
.incbin "baserom.gba", 0x2dae2a, 0xd
gUnknown_082DAE37:: @ 82DAE37
BattleScript_EncoredNoMore:: @ 82DAE37
.incbin "baserom.gba", 0x2dae37, 0x7
gUnknown_082DAE3E:: @ 82DAE3E
@ -192,7 +192,7 @@ gUnknown_082DAFDD:: @ 82DAFDD
gUnknown_082DAFE4:: @ 82DAFE4
.incbin "baserom.gba", 0x2dafe4, 0x8e
gUnknown_082DB072:: @ 82DB072
BattleScript_NoMovesLeft:: @ 82DB072
.incbin "baserom.gba", 0x2db072, 0x4
gUnknown_082DB076:: @ 82DB076
@ -210,16 +210,16 @@ gUnknown_082DB098:: @ 82DB098
gUnknown_082DB0A0:: @ 82DB0A0
.incbin "baserom.gba", 0x2db0a0, 0x4
gUnknown_082DB0A4:: @ 82DB0A4
BattleScript_MoveUsedIsTaunted:: @ 82DB0A4
.incbin "baserom.gba", 0x2db0a4, 0xb
gUnknown_082DB0AF:: @ 82DB0AF
.incbin "baserom.gba", 0x2db0af, 0x8
gUnknown_082DB0B7:: @ 82DB0B7
BattleScript_WishComesTrue:: @ 82DB0B7
.incbin "baserom.gba", 0x2db0b7, 0x37
gUnknown_082DB0EE:: @ 82DB0EE
BattleScript_IngrainTurnHeal:: @ 82DB0EE
.incbin "baserom.gba", 0x2db0ee, 0x29
gUnknown_082DB117:: @ 82DB117
@ -228,7 +228,7 @@ gUnknown_082DB117:: @ 82DB117
gUnknown_082DB168:: @ 82DB168
.incbin "baserom.gba", 0x2db168, 0xe
gUnknown_082DB176:: @ 82DB176
BattleScript_MoveUsedIsImprisoned:: @ 82DB176
.incbin "baserom.gba", 0x2db176, 0xb
gUnknown_082DB181:: @ 82DB181
@ -258,97 +258,97 @@ gUnknown_082DB1D5:: @ 82DB1D5
gUnknown_082DB1FF:: @ 82DB1FF
.incbin "baserom.gba", 0x2db1ff, 0x14
gUnknown_082DB213:: @ 82DB213
BattleScript_MoveUsedIsAsleep:: @ 82DB213
.incbin "baserom.gba", 0x2db213, 0xd
gUnknown_082DB220:: @ 82DB220
BattleScript_MoveUsedWokeUp:: @ 82DB220
.incbin "baserom.gba", 0x2db220, 0x14
gUnknown_082DB234:: @ 82DB234
.incbin "baserom.gba", 0x2db234, 0x9
gUnknown_082DB23D:: @ 82DB23D
BattleScript_PoisonTurnDmg:: @ 82DB23D
.incbin "baserom.gba", 0x2db23d, 0x22
gUnknown_082DB25F:: @ 82DB25F
BattleScript_BurnTurnDmg:: @ 82DB25F
.incbin "baserom.gba", 0x2db25f, 0xb
gUnknown_082DB26A:: @ 82DB26A
BattleScript_MoveUsedIsFrozen:: @ 82DB26A
.incbin "baserom.gba", 0x2db26a, 0xd
gUnknown_082DB277:: @ 82DB277
BattleScript_MoveUsedUnfroze:: @ 82DB277
.incbin "baserom.gba", 0x2db277, 0xb
gUnknown_082DB282:: @ 82DB282
.incbin "baserom.gba", 0x2db282, 0x9
gUnknown_082DB28B:: @ 82DB28B
BattleScript_MoveUsedIsParalyzed:: @ 82DB28B
.incbin "baserom.gba", 0x2db28b, 0x10
gUnknown_082DB29B:: @ 82DB29B
BattleScript_MoveUsedFlinched:: @ 82DB29B
.incbin "baserom.gba", 0x2db29b, 0xb
gUnknown_082DB2A6:: @ 82DB2A6
.incbin "baserom.gba", 0x2db2a6, 0x9
gUnknown_082DB2AF:: @ 82DB2AF
BattleScript_ThrashConfuses:: @ 82DB2AF
.incbin "baserom.gba", 0x2db2af, 0xe
gUnknown_082DB2BD:: @ 82DB2BD
BattleScript_MoveUsedIsConfused:: @ 82DB2BD
.incbin "baserom.gba", 0x2db2bd, 0x43
gUnknown_082DB300:: @ 82DB300
BattleScript_MoveUsedIsConfusedNoMore:: @ 82DB300
.incbin "baserom.gba", 0x2db300, 0x7
gUnknown_082DB307:: @ 82DB307
.incbin "baserom.gba", 0x2db307, 0x7
gUnknown_082DB30E:: @ 82DB30E
BattleScript_WrapTurnDmg:: @ 82DB30E
.incbin "baserom.gba", 0x2db30e, 0x12
gUnknown_082DB320:: @ 82DB320
BattleScript_WrapEnds:: @ 82DB320
.incbin "baserom.gba", 0x2db320, 0x7
gUnknown_082DB327:: @ 82DB327
BattleScript_MoveUsedIsInLove:: @ 82DB327
.incbin "baserom.gba", 0x2db327, 0xd
gUnknown_082DB334:: @ 82DB334
BattleScript_MoveUsedIsParalyzedCantAttack:: @ 82DB334
.incbin "baserom.gba", 0x2db334, 0xb
gUnknown_082DB33F:: @ 82DB33F
BattleScript_NightmareTurnDmg:: @ 82DB33F
.incbin "baserom.gba", 0x2db33f, 0x11
gUnknown_082DB350:: @ 82DB350
BattleScript_CurseTurnDmg:: @ 82DB350
.incbin "baserom.gba", 0x2db350, 0x11
gUnknown_082DB361:: @ 82DB361
.incbin "baserom.gba", 0x2db361, 0x17
gUnknown_082DB378:: @ 82DB378
BattleScript_YawnMakesAsleep:: @ 82DB378
.incbin "baserom.gba", 0x2db378, 0xaa
gUnknown_082DB422:: @ 82DB422
.incbin "baserom.gba", 0x2db422, 0xe
gUnknown_082DB430:: @ 82DB430
BattleScript_DrizzleActivates:: @ 82DB430
.incbin "baserom.gba", 0x2db430, 0x14
gUnknown_082DB444:: @ 82DB444
BattleScript_SpeedBoostActivates:: @ 82DB444
.incbin "baserom.gba", 0x2db444, 0xe
gUnknown_082DB452:: @ 82DB452
BattleScript_TraceActivates:: @ 82DB452
.incbin "baserom.gba", 0x2db452, 0xa
gUnknown_082DB45C:: @ 82DB45C
BattleScript_RainDishActivates:: @ 82DB45C
.incbin "baserom.gba", 0x2db45c, 0x14
gUnknown_082DB470:: @ 82DB470
BattleScript_SandstreamActivates:: @ 82DB470
.incbin "baserom.gba", 0x2db470, 0x14
gUnknown_082DB484:: @ 82DB484
BattleScript_ShedSkinActivates:: @ 82DB484
.incbin "baserom.gba", 0x2db484, 0x25
gUnknown_082DB4A9:: @ 82DB4A9
BattleScript_CastformChange:: @ 82DB4A9
.incbin "baserom.gba", 0x2db4a9, 0xf
gUnknown_082DB4B8:: @ 82DB4B8
@ -357,7 +357,7 @@ gUnknown_082DB4B8:: @ 82DB4B8
gUnknown_082DB4C1:: @ 82DB4C1
.incbin "baserom.gba", 0x2db4c1, 0x69
gUnknown_082DB52A:: @ 82DB52A
BattleScript_DroughtActivates:: @ 82DB52A
.incbin "baserom.gba", 0x2db52a, 0x14
gUnknown_082DB53E:: @ 82DB53E
@ -369,10 +369,10 @@ gUnknown_082DB552:: @ 82DB552
gUnknown_082DB560:: @ 82DB560
.incbin "baserom.gba", 0x2db560, 0xe
gUnknown_082DB56E:: @ 82DB56E
BattleScript_MoveHPDrain_PPLoss:: @ 82DB56E
.incbin "baserom.gba", 0x2db56e, 0x1
gUnknown_082DB56F:: @ 82DB56F
BattleScript_MoveHPDrain:: @ 82DB56F
.incbin "baserom.gba", 0x2db56f, 0x22
gUnknown_082DB591:: @ 82DB591
@ -381,10 +381,10 @@ gUnknown_082DB591:: @ 82DB591
gUnknown_082DB592:: @ 82DB592
.incbin "baserom.gba", 0x2db592, 0x15
gUnknown_082DB5A7:: @ 82DB5A7
BattleScript_FlashFireBoost_PPLoss:: @ 82DB5A7
.incbin "baserom.gba", 0x2db5a7, 0x1
gUnknown_082DB5A8:: @ 82DB5A8
BattleScript_FlashFireBoost:: @ 82DB5A8
.incbin "baserom.gba", 0x2db5a8, 0x1f
gUnknown_082DB5C7:: @ 82DB5C7
@ -405,7 +405,7 @@ gUnknown_082DB5F5:: @ 82DB5F5
gUnknown_082DB603:: @ 82DB603
.incbin "baserom.gba", 0x2db603, 0x1c
gUnknown_082DB61F:: @ 82DB61F
BattleScript_SoundproofProtected:: @ 82DB61F
.incbin "baserom.gba", 0x2db61f, 0x10
gUnknown_082DB62F:: @ 82DB62F
@ -414,19 +414,19 @@ gUnknown_082DB62F:: @ 82DB62F
gUnknown_082DB63F:: @ 82DB63F
.incbin "baserom.gba", 0x2db63f, 0xe
gUnknown_082DB64D:: @ 82DB64D
BattleScript_ColorChangeActivates:: @ 82DB64D
.incbin "baserom.gba", 0x2db64d, 0x7
gUnknown_082DB654:: @ 82DB654
BattleScript_RoughSkinActivates:: @ 82DB654
.incbin "baserom.gba", 0x2db654, 0x1b
gUnknown_082DB66F:: @ 82DB66F
BattleScript_CuteCharmActivates:: @ 82DB66F
.incbin "baserom.gba", 0x2db66f, 0xd
gUnknown_082DB67C:: @ 82DB67C
BattleScript_ApplySecondaryEffect:: @ 82DB67C
.incbin "baserom.gba", 0x2db67c, 0x3
gUnknown_082DB67F:: @ 82DB67F
BattleScript_SynchronizeActivates:: @ 82DB67F
.incbin "baserom.gba", 0x2db67f, 0x3
gUnknown_082DB682:: @ 82DB682
@ -441,7 +441,7 @@ gUnknown_082DB695:: @ 82DB695
gUnknown_082DB6A5:: @ 82DB6A5
.incbin "baserom.gba", 0x2db6a5, 0x8
gUnknown_082DB6AD:: @ 82DB6AD
BattleScript_MoveUsedLoafingAround:: @ 82DB6AD
.incbin "baserom.gba", 0x2db6ad, 0x2c
gUnknown_082DB6D9:: @ 82DB6D9
@ -453,64 +453,64 @@ gUnknown_082DB6F0:: @ 82DB6F0
gUnknown_082DB6FB:: @ 82DB6FB
.incbin "baserom.gba", 0x2db6fb, 0xb
gUnknown_082DB706:: @ 82DB706
BattleScript_BerryCurePrlzEnd2:: @ 82DB706
.incbin "baserom.gba", 0x2db706, 0x6
gUnknown_082DB70C:: @ 82DB70C
BattleScript_BerryCureParRet:: @ 82DB70C
.incbin "baserom.gba", 0x2db70c, 0x12
gUnknown_082DB71E:: @ 82DB71E
BattleScript_BerryCurePsnEnd2:: @ 82DB71E
.incbin "baserom.gba", 0x2db71e, 0x6
gUnknown_082DB724:: @ 82DB724
BattleScript_BerryCurePsnRet:: @ 82DB724
.incbin "baserom.gba", 0x2db724, 0x12
gUnknown_082DB736:: @ 82DB736
BattleScript_BerryCureBrnEnd2:: @ 82DB736
.incbin "baserom.gba", 0x2db736, 0x6
gUnknown_082DB73C:: @ 82DB73C
BattleScript_BerryCureBrnRet:: @ 82DB73C
.incbin "baserom.gba", 0x2db73c, 0x12
gUnknown_082DB74E:: @ 82DB74E
BattleScript_BerryCureFrzEnd2:: @ 82DB74E
.incbin "baserom.gba", 0x2db74e, 0x6
gUnknown_082DB754:: @ 82DB754
BattleScript_BerryCureFrzRet:: @ 82DB754
.incbin "baserom.gba", 0x2db754, 0x12
gUnknown_082DB766:: @ 82DB766
BattleScript_BerryCureSlpEnd2:: @ 82DB766
.incbin "baserom.gba", 0x2db766, 0x6
gUnknown_082DB76C:: @ 82DB76C
BattleScript_BerryCureSlpRet:: @ 82DB76C
.incbin "baserom.gba", 0x2db76c, 0x12
gUnknown_082DB77E:: @ 82DB77E
BattleScript_BerryCureConfusionEnd2:: @ 82DB77E
.incbin "baserom.gba", 0x2db77e, 0x6
gUnknown_082DB784:: @ 82DB784
BattleScript_BerryCureConfusionRet:: @ 82DB784
.incbin "baserom.gba", 0x2db784, 0x10
gUnknown_082DB794:: @ 82DB794
BattleScript_BerryCureChosenStatusEnd2:: @ 82DB794
.incbin "baserom.gba", 0x2db794, 0x6
gUnknown_082DB79A:: @ 82DB79A
BattleScript_BerryCureChosenStatusRet:: @ 82DB79A
.incbin "baserom.gba", 0x2db79a, 0x14
gUnknown_082DB7AE:: @ 82DB7AE
BattleScript_WhiteHerbEnd2:: @ 82DB7AE
.incbin "baserom.gba", 0x2db7ae, 0x6
gUnknown_082DB7B4:: @ 82DB7B4
BattleScript_WhiteHerbRet:: @ 82DB7B4
.incbin "baserom.gba", 0x2db7b4, 0x10
gUnknown_082DB7C4:: @ 82DB7C4
BattleScript_ItemHealHP_RemoveItem:: @ 82DB7C4
.incbin "baserom.gba", 0x2db7c4, 0x1d
gUnknown_082DB7E1:: @ 82DB7E1
BattleScript_BerryPPHealEnd2:: @ 82DB7E1
.incbin "baserom.gba", 0x2db7e1, 0x10
gUnknown_082DB7F1:: @ 82DB7F1
BattleScript_ItemHealHP_End2:: @ 82DB7F1
.incbin "baserom.gba", 0x2db7f1, 0x6
gUnknown_082DB7F7:: @ 82DB7F7
BattleScript_ItemHealHP_Ret:: @ 82DB7F7
.incbin "baserom.gba", 0x2db7f7, 0x1b
gUnknown_082DB812:: @ 82DB812
@ -519,13 +519,13 @@ gUnknown_082DB812:: @ 82DB812
gUnknown_082DB816:: @ 82DB816
.incbin "baserom.gba", 0x2db816, 0xe
gUnknown_082DB824:: @ 82DB824
BattleScript_BerryConfuseHealEnd2:: @ 82DB824
.incbin "baserom.gba", 0x2db824, 0x2a
gUnknown_082DB84E:: @ 82DB84E
BattleScript_BerryStatRaiseEnd2:: @ 82DB84E
.incbin "baserom.gba", 0x2db84e, 0x1b
gUnknown_082DB869:: @ 82DB869
BattleScript_BerryFocusEnergyEnd2:: @ 82DB869
.incbin "baserom.gba", 0x2db869, 0x10
gUnknown_082DB879:: @ 82DB879

16
data/data2b.s
View File

@ -227,25 +227,25 @@ gUnknown_0831BC0C:: @ 831BC0C
gUnknown_0831BC44:: @ 831BC44
.incbin "baserom.gba", 0x31bc44, 0x2c
gUnknown_0831BC70:: @ 831BC70
gStatusConditionString_PoisonJpn:: @ 831BC70
.incbin "baserom.gba", 0x31bc70, 0x8
gUnknown_0831BC78:: @ 831BC78
gStatusConditionString_SleepJpn:: @ 831BC78
.incbin "baserom.gba", 0x31bc78, 0x8
gUnknown_0831BC80:: @ 831BC80
gStatusConditionString_ParalysisJpn:: @ 831BC80
.incbin "baserom.gba", 0x31bc80, 0x8
gUnknown_0831BC88:: @ 831BC88
gStatusConditionString_BurnJpn:: @ 831BC88
.incbin "baserom.gba", 0x31bc88, 0x8
gUnknown_0831BC90:: @ 831BC90
gStatusConditionString_IceJpn:: @ 831BC90
.incbin "baserom.gba", 0x31bc90, 0x8
gUnknown_0831BC98:: @ 831BC98
gStatusConditionString_ConfusionJpn:: @ 831BC98
.incbin "baserom.gba", 0x31bc98, 0x8
gUnknown_0831BCA0:: @ 831BCA0
gStatusConditionString_LoveJpn:: @ 831BCA0
.incbin "baserom.gba", 0x31bca0, 0x8
gUnknown_0831BCA8:: @ 831BCA8
@ -260,6 +260,6 @@ gUnknown_0831BCEF:: @ 831BCEF
gUnknown_0831BCF3:: @ 831BCF3
.incbin "baserom.gba", 0x31bcf3, 0x5
gUnknown_0831BCF8:: @ 831BCF8
gSoundMovesTable:: @ 831BCF8
.incbin "baserom.gba", 0x31bcf8, 0x18

504
data/data3.s
View File

@ -632,499 +632,9 @@ gUnknown_084975B0:: @ 84975B0
gUnknown_084975BC:: @ 84975BC
.incbin "baserom.gba", 0x4975bc, 0x8
gUnknown_084975C4:: @ 84975C4
.incbin "baserom.gba", 0x4975c4, 0x10
// data/field_map_obj.s
gUnknown_084975D4:: @ 84975D4
.incbin "baserom.gba", 0x4975d4, 0x18
gUnknown_084975EC:: @ 84975EC
.incbin "baserom.gba", 0x4975ec, 0xc
@ 84975F8
.include "data/graphics/field_objects/field_object_graphics.inc"
gUnknown_08505438:: @ 8505438
.incbin "baserom.gba", 0x505438, 0x144
gUnknown_0850557C:: @ 850557C
.incbin "baserom.gba", 0x50557c, 0x51
gUnknown_085055CD:: @ 85055CD
.incbin "baserom.gba", 0x5055cd, 0x53
@ 8505620
.include "data/graphics/field_objects/field_object_graphics_info_pointers.inc"
@ 85059F8
.include "data/graphics/field_objects/field_effect_object_template_pointers.inc"
@ 8505A8C
.include "data/graphics/field_objects/field_object_pic_tables.inc"
@ 85089FC
.include "data/graphics/field_objects/field_object_anims.inc"
gUnknown_085094AC:: @ 85094AC
.incbin "baserom.gba", 0x5094ac, 0x40
@ 85094EC
.include "data/graphics/field_objects/field_object_oam.inc"
@ 8509954
.include "data/graphics/field_objects/field_object_graphics_info.inc"
gUnknown_0850BBC8:: @ 850BBC8
.incbin "baserom.gba", 0x50bbc8, 0x138
gUnknown_0850BD00:: @ 850BD00
.incbin "baserom.gba", 0x50bd00, 0x78
gUnknown_0850BD78:: @ 850BD78
.incbin "baserom.gba", 0x50bd78, 0xc0
gUnknown_0850BE38:: @ 850BE38
.incbin "baserom.gba", 0x50be38, 0x10
@ 850BE48
.include "data/graphics/field_objects/berry_tree_graphics_tables.inc"
@ 850C9C0
.include "data/graphics/field_objects/field_effect_objects.inc"
.incbin "baserom.gba", 0x50d6d4, 0x8
gUnknown_0850D6DC:: @ 850D6DC
.incbin "baserom.gba", 0x50d6dc, 0x10
gUnknown_0850D6EC:: @ 850D6EC
.incbin "baserom.gba", 0x50d6ec, 0x8
gUnknown_0850D6F4:: @ 850D6F4
.incbin "baserom.gba", 0x50d6f4, 0x1c
gUnknown_0850D710:: @ 850D710
.incbin "baserom.gba", 0x50d710, 0x4
gUnknown_0850D714:: @ 850D714
.incbin "baserom.gba", 0x50d714, 0x2c
gUnknown_0850D740:: @ 850D740
.incbin "baserom.gba", 0x50d740, 0x14
gUnknown_0850D754:: @ 850D754
.incbin "baserom.gba", 0x50d754, 0x1c
gUnknown_0850D770:: @ 850D770
.incbin "baserom.gba", 0x50d770, 0x4
gUnknown_0850D774:: @ 850D774
.incbin "baserom.gba", 0x50d774, 0x1c
gUnknown_0850D790:: @ 850D790
.incbin "baserom.gba", 0x50d790, 0x4
gUnknown_0850D794:: @ 850D794
.incbin "baserom.gba", 0x50d794, 0xc
gUnknown_0850D7A0:: @ 850D7A0
.incbin "baserom.gba", 0x50d7a0, 0x14
gUnknown_0850D7B4:: @ 850D7B4
.incbin "baserom.gba", 0x50d7b4, 0x14
gUnknown_0850D7C8:: @ 850D7C8
.incbin "baserom.gba", 0x50d7c8, 0x14
gUnknown_0850D7DC:: @ 850D7DC
.incbin "baserom.gba", 0x50d7dc, 0x14
gUnknown_0850D7F0:: @ 850D7F0
.incbin "baserom.gba", 0x50d7f0, 0x4
gUnknown_0850D7F4:: @ 850D7F4
.incbin "baserom.gba", 0x50d7f4, 0x14
gUnknown_0850D808:: @ 850D808
.incbin "baserom.gba", 0x50d808, 0x4
gUnknown_0850D80C:: @ 850D80C
.incbin "baserom.gba", 0x50d80c, 0x14
gUnknown_0850D820:: @ 850D820
.incbin "baserom.gba", 0x50d820, 0x4
gUnknown_0850D824:: @ 850D824
.incbin "baserom.gba", 0x50d824, 0x14
gUnknown_0850D838:: @ 850D838
.incbin "baserom.gba", 0x50d838, 0x4
gUnknown_0850D83C:: @ 850D83C
.incbin "baserom.gba", 0x50d83c, 0x14
gUnknown_0850D850:: @ 850D850
.incbin "baserom.gba", 0x50d850, 0x4
gUnknown_0850D854:: @ 850D854
.incbin "baserom.gba", 0x50d854, 0x14
gUnknown_0850D868:: @ 850D868
.incbin "baserom.gba", 0x50d868, 0x4
gUnknown_0850D86C:: @ 850D86C
.incbin "baserom.gba", 0x50d86c, 0x14
gUnknown_0850D880:: @ 850D880
.incbin "baserom.gba", 0x50d880, 0x4
gUnknown_0850D884:: @ 850D884
.incbin "baserom.gba", 0x50d884, 0x14
gUnknown_0850D898:: @ 850D898
.incbin "baserom.gba", 0x50d898, 0x4
gUnknown_0850D89C:: @ 850D89C
.incbin "baserom.gba", 0x50d89c, 0x10
gUnknown_0850D8AC:: @ 850D8AC
.incbin "baserom.gba", 0x50d8ac, 0x8
gUnknown_0850D8B4:: @ 850D8B4
.incbin "baserom.gba", 0x50d8b4, 0x10
gUnknown_0850D8C4:: @ 850D8C4
.incbin "baserom.gba", 0x50d8c4, 0x8
gUnknown_0850D8CC:: @ 850D8CC
.incbin "baserom.gba", 0x50d8cc, 0x10
gUnknown_0850D8DC:: @ 850D8DC
.incbin "baserom.gba", 0x50d8dc, 0xc
gUnknown_0850D8E8:: @ 850D8E8
.incbin "baserom.gba", 0x50d8e8, 0x4
gUnknown_0850D8EC:: @ 850D8EC
.incbin "baserom.gba", 0x50d8ec, 0xc
gUnknown_0850D8F8:: @ 850D8F8
.incbin "baserom.gba", 0x50d8f8, 0x4
gUnknown_0850D8FC:: @ 850D8FC
.incbin "baserom.gba", 0x50d8fc, 0xc
gUnknown_0850D908:: @ 850D908
.incbin "baserom.gba", 0x50d908, 0x4
gUnknown_0850D90C:: @ 850D90C
.incbin "baserom.gba", 0x50d90c, 0xc
gUnknown_0850D918:: @ 850D918
.incbin "baserom.gba", 0x50d918, 0x4
gUnknown_0850D91C:: @ 850D91C
.incbin "baserom.gba", 0x50d91c, 0xc
gUnknown_0850D928:: @ 850D928
.incbin "baserom.gba", 0x50d928, 0x4
gUnknown_0850D92C:: @ 850D92C
.incbin "baserom.gba", 0x50d92c, 0xc
gUnknown_0850D938:: @ 850D938
.incbin "baserom.gba", 0x50d938, 0x4
gUnknown_0850D93C:: @ 850D93C
.incbin "baserom.gba", 0x50d93c, 0xc
gUnknown_0850D948:: @ 850D948
.incbin "baserom.gba", 0x50d948, 0xc
gUnknown_0850D954:: @ 850D954
.incbin "baserom.gba", 0x50d954, 0x4
gUnknown_0850D958:: @ 850D958
.incbin "baserom.gba", 0x50d958, 0xc
gUnknown_0850D964:: @ 850D964
.incbin "baserom.gba", 0x50d964, 0x4
gUnknown_0850D968:: @ 850D968
.incbin "baserom.gba", 0x50d968, 0xc
gUnknown_0850D974:: @ 850D974
.incbin "baserom.gba", 0x50d974, 0x4
gUnknown_0850D978:: @ 850D978
.incbin "baserom.gba", 0x50d978, 0xc
gUnknown_0850D984:: @ 850D984
.incbin "baserom.gba", 0x50d984, 0x4
gUnknown_0850D988:: @ 850D988
.incbin "baserom.gba", 0x50d988, 0xc
gUnknown_0850D994:: @ 850D994
.incbin "baserom.gba", 0x50d994, 0x4
gUnknown_0850D998:: @ 850D998
.incbin "baserom.gba", 0x50d998, 0xc
gUnknown_0850D9A4:: @ 850D9A4
.incbin "baserom.gba", 0x50d9a4, 0x4
gUnknown_0850D9A8:: @ 850D9A8
.incbin "baserom.gba", 0x50d9a8, 0xc
gUnknown_0850D9B4:: @ 850D9B4
.incbin "baserom.gba", 0x50d9b4, 0x4
gUnknown_0850D9B8:: @ 850D9B8
.incbin "baserom.gba", 0x50d9b8, 0xc
gUnknown_0850D9C4:: @ 850D9C4
.incbin "baserom.gba", 0x50d9c4, 0x4
gUnknown_0850D9C8:: @ 850D9C8
.incbin "baserom.gba", 0x50d9c8, 0xc
gUnknown_0850D9D4:: @ 850D9D4
.incbin "baserom.gba", 0x50d9d4, 0x4
gUnknown_0850D9D8:: @ 850D9D8
.incbin "baserom.gba", 0x50d9d8, 0xc
gUnknown_0850D9E4:: @ 850D9E4
.incbin "baserom.gba", 0x50d9e4, 0x4
gUnknown_0850D9E8:: @ 850D9E8
.incbin "baserom.gba", 0x50d9e8, 0xc
gUnknown_0850D9F4:: @ 850D9F4
.incbin "baserom.gba", 0x50d9f4, 0x4
gUnknown_0850D9F8:: @ 850D9F8
.incbin "baserom.gba", 0x50d9f8, 0xc
gUnknown_0850DA04:: @ 850DA04
.incbin "baserom.gba", 0x50da04, 0x4
gUnknown_0850DA08:: @ 850DA08
.incbin "baserom.gba", 0x50da08, 0xc
gUnknown_0850DA14:: @ 850DA14
.incbin "baserom.gba", 0x50da14, 0x4
gUnknown_0850DA18:: @ 850DA18
.incbin "baserom.gba", 0x50da18, 0xc
gUnknown_0850DA24:: @ 850DA24
.incbin "baserom.gba", 0x50da24, 0x4
gUnknown_0850DA28:: @ 850DA28
.incbin "baserom.gba", 0x50da28, 0xc
gUnknown_0850DA34:: @ 850DA34
.incbin "baserom.gba", 0x50da34, 0x4
gUnknown_0850DA38:: @ 850DA38
.incbin "baserom.gba", 0x50da38, 0xc
gUnknown_0850DA44:: @ 850DA44
.incbin "baserom.gba", 0x50da44, 0x4
gUnknown_0850DA48:: @ 850DA48
.incbin "baserom.gba", 0x50da48, 0xc
gUnknown_0850DA54:: @ 850DA54
.incbin "baserom.gba", 0x50da54, 0x4
gUnknown_0850DA58:: @ 850DA58
.incbin "baserom.gba", 0x50da58, 0xc
gUnknown_0850DA64:: @ 850DA64
.incbin "baserom.gba", 0x50da64, 0x2c
gUnknown_0850DA90:: @ 850DA90
.incbin "baserom.gba", 0x50da90, 0xc
gUnknown_0850DA9C:: @ 850DA9C
.incbin "baserom.gba", 0x50da9c, 0x4
gUnknown_0850DAA0:: @ 850DAA0
.incbin "baserom.gba", 0x50daa0, 0x8
gUnknown_0850DAA8:: @ 850DAA8
.incbin "baserom.gba", 0x50daa8, 0x8
gUnknown_0850DAB0:: @ 850DAB0
.incbin "baserom.gba", 0x50dab0, 0x8
gUnknown_0850DAB8:: @ 850DAB8
.incbin "baserom.gba", 0x50dab8, 0x8
gUnknown_0850DAC0:: @ 850DAC0
.incbin "baserom.gba", 0x50dac0, 0xc
gUnknown_0850DACC:: @ 850DACC
.incbin "baserom.gba", 0x50dacc, 0x9
gUnknown_0850DAD5:: @ 850DAD5
.incbin "baserom.gba", 0x50dad5, 0x9
gUnknown_0850DADE:: @ 850DADE
.incbin "baserom.gba", 0x50dade, 0x9
gUnknown_0850DAE7:: @ 850DAE7
.incbin "baserom.gba", 0x50dae7, 0x9
gUnknown_0850DAF0:: @ 850DAF0
.incbin "baserom.gba", 0x50daf0, 0x9
gUnknown_0850DAF9:: @ 850DAF9
.incbin "baserom.gba", 0x50daf9, 0x9
gUnknown_0850DB02:: @ 850DB02
.incbin "baserom.gba", 0x50db02, 0x9
gUnknown_0850DB0B:: @ 850DB0B
.incbin "baserom.gba", 0x50db0b, 0x9
gUnknown_0850DB14:: @ 850DB14
.incbin "baserom.gba", 0x50db14, 0x9
gUnknown_0850DB1D:: @ 850DB1D
.incbin "baserom.gba", 0x50db1d, 0x9
gUnknown_0850DB26:: @ 850DB26
.incbin "baserom.gba", 0x50db26, 0x9
gUnknown_0850DB2F:: @ 850DB2F
.incbin "baserom.gba", 0x50db2f, 0x9
gUnknown_0850DB38:: @ 850DB38
.incbin "baserom.gba", 0x50db38, 0x9
gUnknown_0850DB41:: @ 850DB41
.incbin "baserom.gba", 0x50db41, 0x9
gUnknown_0850DB4A:: @ 850DB4A
.incbin "baserom.gba", 0x50db4a, 0x9
gUnknown_0850DB53:: @ 850DB53
.incbin "baserom.gba", 0x50db53, 0x9
gUnknown_0850DB5C:: @ 850DB5C
.incbin "baserom.gba", 0x50db5c, 0x10
gUnknown_0850DB6C:: @ 850DB6C
.incbin "baserom.gba", 0x50db6c, 0x10
gUnknown_0850DB7C:: @ 850DB7C
.incbin "baserom.gba", 0x50db7c, 0x24
gUnknown_0850DBA0:: @ 850DBA0
.incbin "baserom.gba", 0x50dba0, 0x5
gUnknown_0850DBA5:: @ 850DBA5
.incbin "baserom.gba", 0x50dba5, 0x5
gUnknown_0850DBAA:: @ 850DBAA
.incbin "baserom.gba", 0x50dbaa, 0x5
gUnknown_0850DBAF:: @ 850DBAF
.incbin "baserom.gba", 0x50dbaf, 0x5
gUnknown_0850DBB4:: @ 850DBB4
.incbin "baserom.gba", 0x50dbb4, 0x5
gUnknown_0850DBB9:: @ 850DBB9
.incbin "baserom.gba", 0x50dbb9, 0x5
gUnknown_0850DBBE:: @ 850DBBE
.incbin "baserom.gba", 0x50dbbe, 0x5
gUnknown_0850DBC3:: @ 850DBC3
.incbin "baserom.gba", 0x50dbc3, 0x5
gUnknown_0850DBC8:: @ 850DBC8
.incbin "baserom.gba", 0x50dbc8, 0x5
gUnknown_0850DBCD:: @ 850DBCD
.incbin "baserom.gba", 0x50dbcd, 0x5
gUnknown_0850DBD2:: @ 850DBD2
.incbin "baserom.gba", 0x50dbd2, 0x5
gUnknown_0850DBD7:: @ 850DBD7
.incbin "baserom.gba", 0x50dbd7, 0x5
gUnknown_0850DBDC:: @ 850DBDC
.incbin "baserom.gba", 0x50dbdc, 0x5
gUnknown_0850DBE1:: @ 850DBE1
.incbin "baserom.gba", 0x50dbe1, 0x5
gUnknown_0850DBE6:: @ 850DBE6
.incbin "baserom.gba", 0x50dbe6, 0x5
gUnknown_0850DBEB:: @ 850DBEB
.incbin "baserom.gba", 0x50dbeb, 0x5
gUnknown_0850DBF0:: @ 850DBF0
.incbin "baserom.gba", 0x50dbf0, 0x5
gUnknown_0850DBF5:: @ 850DBF5
.incbin "baserom.gba", 0x50dbf5, 0x5
gUnknown_0850DBFA:: @ 850DBFA
.incbin "baserom.gba", 0x50dbfa, 0x5
gUnknown_0850DBFF:: @ 850DBFF
.incbin "baserom.gba", 0x50dbff, 0x5
gUnknown_0850DC04:: @ 850DC04
.incbin "baserom.gba", 0x50dc04, 0x5
gUnknown_0850DC09:: @ 850DC09
.incbin "baserom.gba", 0x50dc09, 0x5
gUnknown_0850DC0E:: @ 850DC0E
.incbin "baserom.gba", 0x50dc0e, 0x5
gUnknown_0850DC13:: @ 850DC13
.incbin "baserom.gba", 0x50dc13, 0x5
gUnknown_0850DC18:: @ 850DC18
.incbin "baserom.gba", 0x50dc18, 0x5
gUnknown_0850DC1D:: @ 850DC1D
.incbin "baserom.gba", 0x50dc1d, 0x5
gUnknown_0850DC22:: @ 850DC22
.incbin "baserom.gba", 0x50dc22, 0x5
gUnknown_0850DC27:: @ 850DC27
.incbin "baserom.gba", 0x50dc27, 0x8
gUnknown_0850DC2F:: @ 850DC2F
.incbin "baserom.gba", 0x50dc2f, 0x10
gUnknown_0850DC3F:: @ 850DC3F
.incbin "baserom.gba", 0x50dc3f, 0x11
gUnknown_0850DC50:: @ 850DC50
.incbin "baserom.gba", 0x50dc50, 0x298
gUnknown_0850DEE8:: @ 850DEE8
.incbin "baserom.gba", 0x50dee8, 0xd4
gUnknown_0850DFBC:: @ 850DFBC
.incbin "baserom.gba", 0x50dfbc, 0x6
gUnknown_0850DFC2:: @ 850DFC2
.incbin "baserom.gba", 0x50dfc2, 0x61a
.section .rodata_b
gUnknown_0850E5DC:: @ 850E5DC
.incbin "baserom.gba", 0x50e5dc, 0x8
@ -1184,7 +694,15 @@ gUnknown_0850E84A:: @ 850E84A
.incbin "baserom.gba", 0x50e84a, 0x6
gUnknown_0850E850:: @ 850E850
.incbin "baserom.gba", 0x50e850, 0x2c
.incbin "baserom.gba", 0x50e850, 0x4
gUnknown_0850E854::
.incbin "baserom.gba", 0x50e854, 0x8
gUnknown_0850E85C::
.incbin "baserom.gba", 0x50e85C, 0x8
gUnknown_0850E864::
.incbin "baserom.gba", 0x50e864, 0xc
gUnknown_0850E870::
.incbin "baserom.gba", 0x50e870, 0xc
gUnknown_0850E87C:: @ 850E87C
.incbin "baserom.gba", 0x50e87c, 0x1680

1903
data/field_map_obj.s Normal file
View File

File diff suppressed because it is too large Load Diff

237
include/battle.h
View File

@ -1,6 +1,8 @@
#ifndef GUARD_BATTLE_H
#define GUARD_BATTLE_H
#define BATTLE_BANKS_COUNT 4
#define BATTLE_TYPE_DOUBLE 0x0001
#define BATTLE_TYPE_LINK 0x0002
#define BATTLE_TYPE_WILD 0x0004
@ -24,6 +26,7 @@
#define BATTLE_TYPE_x100000 0x100000
#define BATTLE_TYPE_PYRAMID 0x200000
#define BATTLE_TYPE_INGAME_PARTNER 0x400000
#define BATTLE_TYPE_x800000 0x800000
#define BATTLE_TYPE_RECORDED 0x1000000
#define BATTLE_TYPE_x2000000 0x2000000
#define BATTLE_TYPE_x4000000 0x4000000
@ -135,26 +138,26 @@
#define SIDE_STATUS_MIST (1 << 8)
#define SIDE_STATUS_SPIKES_DAMAGED (1 << 9)
#define ABILITYEFFECT_ON_SWITCHIN 0x0
#define ABILITYEFFECT_ENDTURN 0x1
#define ABILITYEFFECT_MOVES_BLOCK 0x2
#define ABILITYEFFECT_ABSORBING 0x3
#define ABILITYEFFECT_CONTACT 0x4
#define ABILITYEFFECT_IMMUNITY 0x5
#define ABILITYEFFECT_FORECAST 0x6
#define ABILITYEFFECT_SYNCHRONIZE 0x7
#define ABILITYEFFECT_ATK_SYNCHRONIZE 0x8
#define ABILITYEFFECT_INTIMIDATE1 0x9
#define ABILITYEFFECT_INTIMIDATE2 0xA
#define ABILITYEFFECT_TRACE 0xB
#define ABILITYEFFECT_CHECK_OTHER_SIDE 0xC
#define ABILITYEFFECT_CHECK_BANK_SIDE 0xD
#define ABILITYEFFECT_FIELD_SPORT 0xE
#define ABILITYEFFECT_ON_SWITCHIN 0x0
#define ABILITYEFFECT_ENDTURN 0x1
#define ABILITYEFFECT_MOVES_BLOCK 0x2
#define ABILITYEFFECT_ABSORBING 0x3
#define ABILITYEFFECT_CONTACT 0x4
#define ABILITYEFFECT_IMMUNITY 0x5
#define ABILITYEFFECT_FORECAST 0x6
#define ABILITYEFFECT_SYNCHRONIZE 0x7
#define ABILITYEFFECT_ATK_SYNCHRONIZE 0x8
#define ABILITYEFFECT_INTIMIDATE1 0x9
#define ABILITYEFFECT_INTIMIDATE2 0xA
#define ABILITYEFFECT_TRACE 0xB
#define ABILITYEFFECT_CHECK_OTHER_SIDE 0xC
#define ABILITYEFFECT_CHECK_BANK_SIDE 0xD
#define ABILITYEFFECT_FIELD_SPORT 0xE
#define ABILITYEFFECT_CHECK_FIELD_EXCEPT_BANK 0xF
#define ABILITYEFFECT_COUNT_OTHER_SIZE 0x10
#define ABILITYEFFECT_COUNT_BANK_SIDE 0x11
#define ABILITYEFFECT_COUNT_ON_FIELD 0x12
#define ABILITYEFFECT_CHECK_ON_FIELD 0x13
#define ABILITYEFFECT_COUNT_OTHER_SIZE 0x10
#define ABILITYEFFECT_COUNT_BANK_SIDE 0x11
#define ABILITYEFFECT_COUNT_ON_FIELD 0x12
#define ABILITYEFFECT_CHECK_ON_FIELD 0x13
#define WEATHER_HAS_EFFECT ((!AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_CLOUD_NINE, 0, 0) && !AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_AIR_LOCK, 0, 0)))
@ -171,7 +174,6 @@
#define MAX_TRAINER_ITEMS 4
#define MAX_MON_MOVES 4
#define MAX_BANKS_BATTLE 4
#define WEATHER_RAIN_TEMPORARY (1 << 0)
#define WEATHER_RAIN_DOWNPOUR (1 << 1)
@ -186,8 +188,26 @@
#define WEATHER_HAIL (1 << 7)
#define WEATHER_HAIL_ANY ((WEATHER_HAIL))
u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg);
u8 GetBankSide(u8 bank);
#define REQUEST_ALL_BATTLE 0x0
#define REQUEST_SPECIES_BATTLE 0x1
#define REQUEST_HELDITEM_BATTLE 0x2
#define REQUEST_MOVES_PP_BATTLE 0x3
#define REQUEST_PPMOVE1_BATTLE 0x9
#define REQUEST_PPMOVE2_BATTLE 0xA
#define REQUEST_PPMOVE3_BATTLE 0xB
#define REQUEST_PPMOVE4_BATTLE 0xC
#define REQUEST_STATUS_BATTLE 0x28
#define REQUEST_HP_BATTLE 0x2A
// array entries for battle communication
#define MOVE_EFFECT_BYTE 0x3
#define MULTISTRING_CHOOSER 0x5
#define MSG_DISPLAY 0x7
// functions
extern u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg);
extern u8 GetBankSide(u8 bank);
struct Trainer
{
@ -248,9 +268,102 @@ struct DisableStruct
/*0x1A*/ u8 unk1A[2];
};
extern struct DisableStruct gDisableStructs[];
extern struct DisableStruct gDisableStructs[BATTLE_BANKS_COUNT];
struct ProtectStruct
{
/* field_0 */
u32 protected:1;
u32 endured:1;
u32 onlyStruggle:1;
u32 helpingHand:1;
u32 bounceMove:1;
u32 stealMove:1;
u32 flag0Unknown:1;
u32 prlzImmobility:1;
/* field_1 */
u32 confusionSelfDmg:1;
u32 notEffective:1;
u32 chargingTurn:1;
u32 fleeFlag:2; // for RunAway and Smoke Ball
u32 usedImprisionedMove:1;
u32 loveImmobility:1;
u32 usedDisabledMove:1;
/* field_2 */
u32 usedTauntedMove:1; // 0x1
u32 flag2Unknown:1; // 0x2
u32 flinchImmobility:1; // 0x4
u32 notFirstStrike:1; // 0x8
u32 flag_x10 : 1; // 0x10
u32 flag_x20 : 1; // 0x20
u32 flag_x40 : 1; // 0x40
u32 flag_x80 : 1; // 0x80
/* field_3 */
u32 field3 : 8;
/* field_4 */ u32 physicalDmg;
/* field_8 */ u32 specialDmg;
/* field_C */ u8 physicalBank;
/* field_D */ u8 specialBank;
/* field_E */ u16 fieldE;
};
extern struct ProtectStruct gProtectStructs[BATTLE_BANKS_COUNT];
struct SpecialStatus
{
u8 statLowered : 1;
u8 lightningRodRedirected : 1;
u8 restoredBankSprite: 1;
u8 intimidatedPoke : 1;
u8 traced : 1;
u8 flag20 : 1;
u8 flag40 : 1;
u8 focusBanded : 1;
u8 field1[3];
s32 moveturnLostHP;
s32 moveturnLostHP_physical;
s32 moveturnLostHP_special;
u8 moveturnPhysicalBank;
u8 moveturnSpecialBank;
u8 field12;
u8 field13;
};
extern struct SpecialStatus gSpecialStatuses[BATTLE_BANKS_COUNT];
struct SideTimer
{
/*0x00*/ u8 reflectTimer;
/*0x01*/ u8 reflectBank;
/*0x02*/ u8 lightscreenTimer;
/*0x03*/ u8 lightscreenBank;
/*0x04*/ u8 mistTimer;
/*0x05*/ u8 mistBank;
/*0x06*/ u8 safeguardTimer;
/*0x07*/ u8 safeguardBank;
/*0x08*/ u8 followmeTimer;
/*0x09*/ u8 followmeTarget;
/*0x0A*/ u8 spikesAmount;
/*0x0B*/ u8 fieldB;
};
extern struct SideTimer gSideTimers[];
struct WishFutureKnock
{
u8 futureSightCounter[BATTLE_BANKS_COUNT];
u8 futureSightAttacker[BATTLE_BANKS_COUNT];
s32 futureSightDmg[BATTLE_BANKS_COUNT];
u16 futureSightMove[BATTLE_BANKS_COUNT];
u8 wishCounter[BATTLE_BANKS_COUNT];
u8 wishUserID[BATTLE_BANKS_COUNT];
u8 weatherDuration;
u16 knockedOffPokes;
};
extern struct WishFutureKnock gWishFutureKnock;
//size should be 0x1C
struct AI_ThinkingStruct
{
u8 aiState;
@ -267,23 +380,28 @@ struct AI_ThinkingStruct
struct UsedMoves
{
u16 moves[4];
u16 unknown[4];
u16 moves[BATTLE_BANKS_COUNT];
u16 unknown[BATTLE_BANKS_COUNT];
};
//size should be 0x54
struct BattleHistory
{
struct UsedMoves usedMoves[4];
u8 abilities[4];
u8 itemEffects[4];
u16 TrainerItems[4];
struct UsedMoves usedMoves[BATTLE_BANKS_COUNT];
u8 abilities[BATTLE_BANKS_COUNT];
u8 itemEffects[BATTLE_BANKS_COUNT];
u16 TrainerItems[BATTLE_BANKS_COUNT];
u8 itemsNo;
};
struct BattleScriptsStack
{
u8 *ptr[8];
const u8 *ptr[8];
u8 size;
};
struct BattleCallbacksStack
{
void (*function[8])(void);
u8 size;
};
@ -292,7 +410,7 @@ struct BattleResources
struct SecretBaseRecord* secretBase;
struct UnknownFlags *flags;
struct BattleScriptsStack* battleScriptsStack;
void* battleCallbackStack;
struct BattleCallbacksStack* battleCallbackStack;
void* statsBeforeLvlUp;
struct AI_ThinkingStruct *ai;
struct BattleHistory *battleHistory;
@ -301,6 +419,9 @@ struct BattleResources
extern struct BattleResources* gBattleResources;
#define BATTLESCRIPTS_STACK (gBattleResources->battleScriptsStack)
#define BATTLE_CALLBACKS_STACK (gBattleResources->battleCallbackStack)
struct BattleResults
{
u8 playerFaintCounter; // 0x0
@ -331,12 +452,11 @@ extern struct BattleResults gBattleResults;
struct BattleStruct
{
u8 field_1;
u8 field_2;
u8 field_3;
u8 field_4;
u8 wrappedMove1[4];
u8 wrappedMove2[4];
u8 turnEffectsTracker;
u8 turnEffectsBank;
u8 filler2;
u8 turncountersTracker;
u8 wrappedMove[8]; // ask gamefreak why they declared it that way
u8 moveTarget[4];
u8 expGetterId;
u8 field_11;
@ -393,7 +513,7 @@ struct BattleStruct
u8 field_47;
u8 field_48;
u8 field_49;
u8 field_4A;
u8 moneyMultiplier;
u8 field_4B;
u8 field_4C;
u8 field_4D;
@ -411,10 +531,7 @@ struct BattleStruct
u8 field_59;
u8 field_5A;
u8 field_5B;
u8 field_5C;
u8 field_5D;
u8 field_5E;
u8 field_5F;
u8 field_5C[4];
u8 field_60;
u8 field_61;
u8 field_62;
@ -494,10 +611,31 @@ struct BattleStruct
u8 field_B6;
u8 field_B7;
u16 usedHeldItems[4];
u8 field_C0[8];
u16 choicedMove[4];
u8 field_D0[8];
u8 intimidateBank;
u8 fillerD9[0xDA-0xD9];
u8 field_DA;
u8 turnSideTracker;
u8 fillerDC[0xDF-0xDC];
u8 field_DF;
u8 fillerE0[0x1A0-0xE0];
u8 field_1A0;
u8 field_1A1;
u8 filler1A2;
u8 atkCancellerTracker;
};
extern struct BattleStruct* gBattleStruct;
#define MEME_ACCESS_U8(structName, structPtr, arrayId, offsetField, value) \
{ \
u8* var2 = (u8*)((u32)(arrayId)); \
var2 = (u32)(structPtr) + var2; \
var2[offsetof(struct structName, offsetField)] = value; \
}
struct BattleScripting
{
u8 field_0;
@ -513,6 +651,17 @@ struct BattleScripting
u8 field_D;
u8 dmgMultiplier;
u8 field_F;
u8 animArg1;
u8 animArg2;
u8 field_12;
u8 field_13;
u8 atk49_state;
u8 field_15;
u8 field_16;
u8 bank;
u8 field_18;
u8 field_19;
u8 statChanger;
};
extern struct BattleScripting gBattleScripting;

6
include/berry.h
View File

@ -11,6 +11,12 @@ enum
BERRY_FIRMNESS_SUPER_HARD,
};
#define NUM_BERRIES 44
extern const u8 *const gBerryTreeFieldObjectGraphicsIdTablePointers[NUM_BERRIES];
extern const struct SpriteFrameImage *const gBerryTreePicTablePointers[NUM_BERRIES];
extern const u8 *const gBerryTreePaletteSlotTablePointers[NUM_BERRIES];
void ClearEnigmaBerries(void);
void SetEnigmaBerry(u8 *src);
u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry);

11
include/event_scripts.h Executable file
View File

@ -0,0 +1,11 @@
//
// Created by scott on 9/12/2017.
//
#ifndef GUARD_EVENT_SCRIPTS_H
#define GUARD_EVENT_SCRIPTS_H
extern const u8 gUnknown_082766A2[];
extern const u8 gUnknown_082766A6[];
#endif //GUARD_EVENT_SCRIPTS_H

25
include/field_camera.h Normal file
View File

@ -0,0 +1,25 @@
#ifndef GUARD_FIELD_CAMERA_H
#define GUARD_FIELD_CAMERA_H
// Exported type declarations
struct CameraObject
{
void (*callback)(struct CameraObject *);
u32 unk4;
s32 unk8;
s32 unkC;
s32 x;
s32 y;
};
extern struct CameraObject gUnknown_03005DD0;
// Exported RAM declarations
extern u16 gUnknown_03005DEC;
extern u16 gUnknown_03005DE8;
// Exported ROM declarations
#endif //GUARD_FIELD_CAMERA_H

80
include/field_effect.h Normal file
View File

@ -0,0 +1,80 @@
//
// Created by Scott Norton on 9/15/17.
//
#ifndef GUARD_FIELD_EFFECTS_H
#define GUARD_FIELD_EFFECTS_H
enum FieldEffectScriptIdx
{
FLDEFF_EXCLAMATION_MARK_ICON_1,
FLDEFF_USE_CUT_ON_GRASS,
FLDEFF_USE_CUT_ON_TREE,
FLDEFF_SHADOW,
FLDEFF_TALL_GRASS,
FLDEFF_RIPPLE,
FLDEFF_FIELD_MOVE_SHOW_MON,
FLDEFF_ASH,
FLDEFF_SURF_BLOB,
FLDEFF_USE_SURF,
FLDEFF_DUST,
FLDEFF_USE_SECRET_POWER_CAVE,
FLDEFF_JUMP_TALL_GRASS,
FLDEFF_SAND_FOOTPRINTS,
FLDEFF_JUMP_BIG_SPLASH,
FLDEFF_SPLASH,
FLDEFF_JUMP_SMALL_SPLASH,
FLDEFF_LONG_GRASS,
FLDEFF_JUMP_LONG_GRASS,
FLDEFF_UNKNOWN_19,
FLDEFF_UNKNOWN_20,
FLDEFF_UNKNOWN_21,
FLDEFF_UNKNOWN_22,
FLDEFF_BERRY_TREE_GROWTH_SPARKLE,
FLDEFF_DEEP_SAND_FOOTPRINTS,
FLDEFF_POKECENTER_HEAL,
FLDEFF_USE_SECRET_POWER_TREE,
FLDEFF_USE_SECRET_POWER_SHRUB,
FLDEFF_TREE_DISGUISE,
FLDEFF_MOUNTAIN_DISGUISE,
FLDEFF_NPCFLY_OUT,
FLDEFF_USE_FLY,
FLDEFF_FLY_IN,
FLDEFF_EXCLAMATION_MARK_ICON_2,
FLDEFF_FEET_IN_FLOWING_WATER,
FLDEFF_BIKE_TIRE_TRACKS,
FLDEFF_SAND_DISGUISE,
FLDEFF_USE_ROCK_SMASH,
FLDEFF_USE_DIG,
FLDEFF_SAND_PILE,
FLDEFF_USE_STRENGTH,
FLDEFF_SHORT_GRASS,
FLDEFF_HOT_SPRINGS_WATER,
FLDEFF_USE_WATERFALL,
FLDEFF_USE_DIVE,
FLDEFF_POKEBALL,
FLDEFF_HEART_ICON,
FLDEFF_NOP_47,
FLDEFF_NOP_48,
FLDEFF_POP_OUT_OF_ASH,
FLDEFF_LAVARIDGE_GYM_WARP,
FLDEFF_SWEET_SCENT,
FLDEFF_SAND_PILLAR,
FLDEFF_BUBBLES,
FLDEFF_SPARKLE,
FLDEFF_SECRET_POWER_CAVE,
FLDEFF_SECRET_POWER_TREE,
FLDEFF_SECRET_POWER_SHRUB,
FLDEFF_CUT_GRASS,
FLDEFF_FIELD_MOVE_SHOW_MON_INIT,
FLDEFF_USE_FLY_ANCIENT_TOMB,
FLDEFF_PCTURN_ON,
FLDEFF_HALL_OF_FAME_RECORD,
FLDEFF_USE_TELEPORT
};
extern u32 gFieldEffectSpawnParams[8];
u8 FieldEffectStart(u8);
#endif //GUARD_FIELD_EFFECTS_H

16
include/field_effect_helpers.h Normal file
View File

@ -0,0 +1,16 @@
//
// Created by scott on 9/7/2017.
//
#ifndef GUARD_FIELD_EFFECT_HELPERS_H
#define GUARD_FIELD_EFFECT_HELPERS_H
// Exported type declarations
// Exported RAM declarations
// Exported ROM declarations
u8 sub_8154228(void);
bool8 sub_8155DA0(struct MapObject *);
#endif //GUARD_FIELD_EFFECT_HELPERS_H

22
include/field_ground_effect.h Normal file
View File

@ -0,0 +1,22 @@
//
// Created by scott on 9/6/2017.
//
#ifndef GUARD_FIELD_GROUND_EFFECT_H
#define GUARD_FIELD_GROUND_EFFECT_H
// Exported type declarations
// Exported RAM declarations
// Exported ROM declarations
void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8);
void InitObjectPriorityByZCoord(struct Sprite *, u8);
bool8 IsZCoordMismatchAt(u8, s16, s16);
bool8 AreZCoordsCompatible(u8, u8);
void FieldObjectUpdateSubpriority(struct MapObject *, struct Sprite *);
void DoGroundEffects_OnSpawn(struct MapObject *, struct Sprite *);
void DoGroundEffects_OnBeginStep(struct MapObject *, struct Sprite *);
void DoGroundEffects_OnFinishStep(struct MapObject *, struct Sprite *);
#endif //GUARD_FIELD_GROUND_EFFECT_H

79
include/field_map_obj.h Executable file
View File

@ -0,0 +1,79 @@
#ifndef GUARD_FIELD_MAP_OBJ_H
#define GUARD_FIELD_MAP_OBJ_H
#define NUM_OBJECT_GRAPHICS_INFO 239
#define SPRITE_VAR 240
// Exported struct declarations
enum SpinnerRunnerFollowPatterns {
RUNFOLLOW_ANY,
RUNFOLLOW_NORTH_SOUTH,
RUNFOLLOW_EAST_WEST,
RUNFOLLOW_NORTH_WEST,
RUNFOLLOW_NORTH_EAST,
RUNFOLLOW_SOUTH_WEST,
RUNFOLLOW_SOUTH_EAST,
RUNFOLLOW_NORTH_SOUTH_WEST,
RUNFOLLOW_NORTH_SOUTH_EAST,
RUNFOLLOW_NORTH_EAST_WEST,
RUNFOLLOW_SOUTH_EAST_WEST
};
// Exported RAM declarations
// Exported ROM declarations
void sub_808D438(void);
u8 GetFieldObjectIdByLocalIdAndMap(u8, u8, u8);
bool8 TryGetFieldObjectIdByLocalIdAndMap(u8, u8, u8, u8 *);
u8 GetFieldObjectIdByXY(s16, s16);
void FieldObjectSetDirection(struct MapObject *, u8);
u8 sub_808D4F4(void);
void RemoveFieldObjectByLocalIdAndMap(u8, u8, u8);
void npc_load_two_palettes__no_record(u16, u8);
void npc_load_two_palettes__and_record(u16, u8);
void pal_patch_for_npc(u16, u8);
void sub_808E16C(s16, s16);
void sub_8092FF0(s16, s16, s16 *, s16 *);
u8 FieldObjectDirectionToImageAnimId(u8);
void sub_80930E0(s16 *, s16 *, s16, s16);
void FieldObjectClearAnim(struct MapObject *);
void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *);
void SpawnFieldObjectsInView(s16, s16);
u8 sprite_new(u8, u8, s16, s16, u8, u8);
u8 AddPseudoFieldObject(u16, void (*)(struct Sprite *), s16, s16, u8);
u8 show_sprite(u8, u8, u8);
u8 SpawnSpecialFieldObjectParametrized(u8, u8, u8, s16, s16, u8);
u8 SpawnSpecialFieldObject(struct MapObjectTemplate *);
void sub_8093038(s16, s16, s16 *, s16 *);
void CameraObjectReset1(void);
void FieldObjectSetGraphicsId(struct MapObject *, u8);
void FieldObjectTurn(struct MapObject *, u8);
void FieldObjectTurnByLocalIdAndMap(u8, u8, u8, u8);
const struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8);
void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8);
void gpu_pal_allocator_reset__manage_upper_four(void);
void sub_808E82C(u8, u8, u8, s16, s16);
void sub_808E7E4(u8, u8, u8);
void sub_808E78C(u8, u8, u8, u8);
void sub_808E75C(s16, s16);
void FieldObjectGetLocalIdAndMap(struct MapObject *, u8 *, u8 *, u8 *);
void npc_coords_shift(struct MapObject *, s16, s16);
void sub_808EB08(struct MapObject *, s16, s16);
void sub_808F254(u8, u8, u8);
void FieldObjectStep(struct MapObject *, struct Sprite *, bool8(struct MapObject *, struct Sprite *));
u8 GetOppositeDirection(u8);
u8 GetStepInPlaceDelay4AnimId(u32);
u8 GetStepInPlaceDelay8AnimId(u32);
u8 GetStepInPlaceDelay16AnimId(u32);
u8 GetStepInPlaceDelay32AnimId(u32);
u8 npc_block_way(struct MapObject *, s16, s16, u32);
void MoveCoords(u8, s16 *, s16 *);
bool8 FieldObjectIsSpecialAnimActive(struct MapObject *);
// Exported data declarations
extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
#endif //GUARD_FIELD_MAP_OBJ_H

17
include/field_player_avatar.h Normal file
View File

@ -0,0 +1,17 @@
//
// Created by Scott Norton on 9/6/17.
//
#ifndef GUARD_FIELD_PLAYER_AVATAR_H
#define GUARD_FIELD_PLAYER_AVATAR_H
void ClearPlayerAvatarInfo(void);
void SetPlayerAvatarExtraStateTransition(u8, u8);
u8 GetPlayerAvatarGenderByGraphicsId(u8);
bool8 TestPlayerAvatarFlags(u8);
void PlayerGetDestCoords(s16 *, s16 *);
u8 player_get_direction_lower_nybble(void);
u8 player_get_direction_upper_nybble(void);
u8 player_get_x22(void);
#endif //GUARD_FIELD_PLAYER_AVATAR_H

17
include/fieldmap.h
View File

@ -1,6 +1,19 @@
//
// Created by scott on 9/16/2017.
//
#ifndef GUARD_FIELDMAP_H
#define GUARD_FIELDMAP_H
void GetCameraCoords(u16*, u16*);
// Exported type declarations
#endif // GUARD_FIELDMAP_H
// Exported RAM declarations
// Exported ROM declarations
u8 MapGridGetMetatileBehaviorAt(s16, s16);
void GetCameraCoords(u16*, u16*);
bool8 MapGridIsImpassableAt(s16, s16);
s32 GetMapBorderIdAt(s16, s16);
bool32 CanCameraMoveInDirection(u8);
#endif //GUARD_FIELDMAP_H

79
include/global.fieldmap.h
View File

@ -1,6 +1,8 @@
#ifndef GUARD_GLOBAL_FIELDMAP_H
#define GUARD_GLOBAL_FIELDMAP_H
#define NUM_FIELD_OBJECTS 16
enum
{
CONNECTION_SOUTH = 1,
@ -84,7 +86,7 @@ struct MapObjectTemplate
///*0x0B*/ u8 fillerB[1];
/*0x0C*/ u16 unkC;
/*0x0E*/ u16 unkE;
/*0x10*/ u8 *script;
/*0x10*/ const u8 *script;
/*0x14*/ u16 flagId;
/*0x16*/ u8 filler_16[2];
}; /*size = 0x18*/
@ -224,7 +226,13 @@ struct MapObject
/*0x14*/ struct Coords16 coords3;
/*0x18*/ u8 mapobj_unk_18:4; //current direction?
/*0x18*/ u8 placeholder18:4;
/*0x19*/ u8 mapobj_unk_19;
/*0x19*/ union __attribute__((packed)) {
u8 as_byte;
struct __attribute__((packed)) {
u8 x:4;
u8 y:4;
} __attribute__((aligned (1))) as_nybbles;
} __attribute__((aligned (1))) range;
/*0x1A*/ u8 mapobj_unk_1A;
/*0x1B*/ u8 mapobj_unk_1B;
/*0x1C*/ u8 mapobj_unk_1C;
@ -237,68 +245,6 @@ struct MapObject
/*size = 0x24*/
};
// THIS IS NEEDED TO MAKE TRAINER_SEE.C MATCH, PLEASE DO NOT REMOVE UNLESS YOU FIX CHECKPATHBETWEENTRAINERANDPLAYER
struct MapObject2
{
/*0x00*/ u32 active:1;
u32 mapobj_bit_1:1;
u32 mapobj_bit_2:1;
u32 mapobj_bit_3:1;
u32 mapobj_bit_4:1;
u32 mapobj_bit_5:1;
u32 mapobj_bit_6:1;
u32 mapobj_bit_7:1;
/*0x01*/ u32 mapobj_bit_8:1;
u32 mapobj_bit_9:1;
u32 mapobj_bit_10:1;
u32 mapobj_bit_11:1;
u32 mapobj_bit_12:1;
u32 mapobj_bit_13:1;
u32 mapobj_bit_14:1;
u32 mapobj_bit_15:1;
/*0x02*/ u32 mapobj_bit_16:1;
u32 mapobj_bit_17:1;
u32 mapobj_bit_18:1;
u32 mapobj_bit_19:1;
u32 mapobj_bit_20:1;
u32 mapobj_bit_21:1;
u32 mapobj_bit_22:1;
u32 mapobj_bit_23:1;
/*0x03*/ u32 mapobj_bit_24:1;
u32 mapobj_bit_25:1;
u32 mapobj_bit_26:1;
u32 mapobj_bit_27:1;
u32 mapobj_bit_28:1;
u32 mapobj_bit_29:1;
u32 mapobj_bit_30:1;
u32 mapobj_bit_31:1;
/*0x04*/ u8 spriteId;
/*0x05*/ u8 graphicsId;
/*0x06*/ u8 animPattern;
/*0x07*/ u8 trainerType;
/*0x08*/ u8 localId;
/*0x09*/ u8 mapNum;
/*0x0A*/ u8 mapGroup;
/*0x0B*/ u8 mapobj_unk_0B_0:4;
u8 elevation:4;
/*0x0C*/ struct Coords16 coords1;
/*0x10*/ struct Coords16 coords2;
/*0x14*/ struct Coords16 coords3;
/*0x18*/ u8 mapobj_unk_18:4;
/*0x18*/ u8 placeholder18:4;
/*0x19*/ u8 mapobj_unk_19:4;
/*0x19*/ u8 mapobj_unk_19b:4;
/*0x1A*/ u8 mapobj_unk_1A;
/*0x1B*/ u8 mapobj_unk_1B;
/*0x1C*/ u8 mapobj_unk_1C;
/*0x1D*/ u8 trainerRange_berryTreeId;
/*0x1E*/ u8 mapobj_unk_1E;
/*0x1F*/ u8 mapobj_unk_1F;
/*0x20*/ u8 mapobj_unk_20;
/*0x21*/ u8 mapobj_unk_21;
/*size = 0x24*/
};
struct MapObjectGraphicsInfo
{
/*0x00*/ u16 tileTag;
@ -376,14 +322,15 @@ struct PlayerAvatar /* 0x202E858 */
struct Camera
{
bool8 field_0:1;
bool8 active:1;
s32 x;
s32 y;
};
extern struct MapObject gMapObjects[];
extern struct MapObject gMapObjects[NUM_FIELD_OBJECTS];
extern u8 gSelectedMapObject;
extern struct MapHeader gMapHeader;
extern struct PlayerAvatar gPlayerAvatar;
extern struct Camera gCamera;
#endif // GUARD_GLOBAL_FIELDMAP_H

8
include/global.h
View File

@ -9,6 +9,12 @@
// to help in decompiling
#define asm_comment(x) asm volatile("@ -- " x " -- ")
#define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided")
#if defined (__APPLE__) || defined (__CYGWIN__)
void memset(void *, int, size_t);
void memcpy(void *, const void *, size_t);
#endif // __APPLE__
#define ARRAY_COUNT(array) (sizeof(array) / sizeof((array)[0]))
@ -752,4 +758,6 @@ struct Bitmap // TODO: Find a better spot for this
u32 height:16;
};
extern u8 gReservedSpritePaletteCount;
#endif // GUARD_GLOBAL_H

9
include/hall_of_fame.h Normal file
View File

@ -0,0 +1,9 @@
#ifndef GUARD_HALL_OF_FAME_H
#define GUARD_HALL_OF_FAME_H
void sub_8141F90(void);
void sub_8143648(u16 paletteTag, u8 arg1);
void sub_81428CC(void);
void sub_8143680(int, u8);
#endif // GUARD_HALL_OF_FAME_H

5
include/malloc.h
View File

@ -1,8 +1,11 @@
#ifndef GUARD_MALLOC_H
#define GUARD_MALLOC_H
extern u8 gHeap[];
#define malloc Alloc
#define calloc AllocZeroed
#define free Free
extern u8 gHeap[];
void *Alloc(u32 size);
void *AllocZeroed(u32 size);
void Free(void *pointer);

32
include/map_obj_8097404.h Normal file
View File

@ -0,0 +1,32 @@
//
// Created by scott on 9/7/2017.
//
#ifndef GUARD_MAP_OBJ_8097404_H
#define GUARD_MAP_OBJ_8097404_H
// Exported type declarations
// Exported RAM declarations
extern void *gUnknown_020375B8;
// Exported ROM declarations
void sub_8097AC8(struct Sprite *);
void npc_sync_anim_pause_bits(struct MapObject *);
void oamt_npc_ministep_reset(struct Sprite *, u8, u8);
u8 sub_8097F78(struct MapObject *);
bool8 obj_npc_ministep(struct Sprite *sprite);
bool8 sub_80976EC(struct Sprite *sprite);
void sub_80976DC(struct Sprite *, u8);
void sub_809783C(struct Sprite *, u8, u8, u8);
void DoShadowFieldEffect(struct MapObject *);
u8 sub_809785C(struct Sprite *);
u8 sub_80978E4(struct Sprite *);
void obj_anim_image_set_and_seek(struct Sprite *, u8, u8);
bool8 sub_80979BC(struct Sprite *);
void sub_8097750(struct Sprite *);
bool8 sub_8097758(struct Sprite *);
void sub_8097FA4(struct MapObject *);
void sub_8098044(u8);
#endif //GUARD_MAP_OBJ_8097404_H

2
include/mauville_old_man.h
View File

@ -1,6 +1,8 @@
#ifndef GUARD_MAUVILLE_OLD_MAN_H
#define GUARD_MAUVILLE_OLD_MAN_H
void SetMauvilleOldMan(void);
u8 sub_81201C8(void);
#endif // GUARD_MAUVILLE_OLD_MAN_H

11
include/metatile_behavior.h Normal file
View File

@ -0,0 +1,11 @@
#ifndef GUARD_METATILE_BEHAVIOR_H
#define GUARD_METATILE_BEHAVIOR_H
// Exported type declarations
// Exported RAM declarations
// Exported ROM declarations
bool8 sub_8088E64(u8);
#endif //GUARD_METATILE_BEHAVIOR_H

6
include/pokemon.h
View File

@ -439,6 +439,12 @@ struct BattleMove
u8 flags;
};
#define FLAG_MAKES_CONTACT 0x1
#define FLAG_PROTECT_AFFECTED 0x2
#define FLAG_MAGICCOAT_AFFECTED 0x4
#define FLAG_SNATCH_AFFECTED 0x8
#define FLAG_KINGSROCK_AFFECTED 0x20
struct SpindaSpot
{
u8 x, y;

29
include/rom4.h
View File

@ -1,15 +1,32 @@
//
// Created by scott on 9/15/2017.
//
#ifndef GUARD_ROM4_H
#define GUARD_ROM4_H
// Exported type declarations
struct UnkPlayerStruct
{
u8 player_field_0;
u8 player_field_1;
};
// Exported RAM declarations
struct LinkPlayerMapObject
{
u8 active;
u8 linkPlayerId;
u8 mapObjId;
u8 mode;
};
// Exported ROM declarations
struct UCoords32
{
u32 x, y;
};
extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4];
void strange_npc_table_clear(void);
const struct MapHeader *get_mapheader_by_bank_and_number(u8, u8);
void FieldObjectMoveDestCoords(struct MapObject *, u32, s16 *, s16 *);
void sub_8086230(void);
#endif //GUARD_ROM4_H

11
include/rom_818CFC8.h Normal file
View File

@ -0,0 +1,11 @@
//
// Created by Scott Norton on 9/6/17.
//
#ifndef GUARD_ROM_818CFC8_H
#define GUARD_ROM_818CFC8_H
bool8 InBattlePyramid(void);
u8 sub_81AAA40(void);
#endif //GUARD_ROM_818CFC8_H

12
include/rom_81BE66C.h Normal file
View File

@ -0,0 +1,12 @@
//
// Created by Scott Norton on 9/6/17.
//
#ifndef GUARD_ROM_81BE66C_H
#define GUARD_ROM_81BE66C_H
bool32 InTrainerHill(void);
bool8 FieldObjectIsFarawayIslandMew(struct MapObject *);
u32 sub_81D427C(void);
#endif //GUARD_ROM_81BE66C_H

2
include/sprite.h
View File

@ -240,6 +240,8 @@ struct OamMatrix
extern const struct OamData gDummyOamData;
extern const union AnimCmd *const gDummySpriteAnimTable[];
extern const union AffineAnimCmd *const gDummySpriteAffineAnimTable[];
extern s16 gSpriteCoordOffsetX;
extern s16 gSpriteCoordOffsetY;
extern struct Sprite gSprites[];

7
include/trainer_see.h Normal file
View File

@ -0,0 +1,7 @@
#ifndef GUARD_TRAINER_SEE_H
#define GUARD_TRAINER_SEE_H
void sub_80B4578(struct MapObject *);
void sub_8155D78(struct MapObject *);
#endif //GUARD_TRAINER_SEE_H

6
ld_script.txt
View File

@ -58,7 +58,7 @@ SECTIONS {
src/decompress.o(.text);
asm/battle_1.o(.text);
asm/battle_2.o(.text);
asm/battle_3.o(.text);
src/battle_3.o(.text);
src/battle_4.o(.text);
asm/battle_4.o(.text);
asm/battle_5.o(.text);
@ -96,7 +96,7 @@ SECTIONS {
asm/field_camera.o(.text);
asm/field_door.o(.text);
asm/field_player_avatar.o(.text);
asm/field_map_obj.o(.text);
src/field_map_obj.o(.text);
asm/field_ground_effect.o(.text);
asm/map_obj_8097404.o(.text);
asm/field_message_box.o(.text);
@ -340,6 +340,8 @@ SECTIONS {
src/trig.o(.rodata);
src/util.o(.rodata);
data/data3.o(.rodata);
data/field_map_obj.o(.rodata);
data/data3.o(.rodata_b);
src/berry.o(.rodata);
data/data3_a1.o(.rodata);
src/pokemon_size_record.o(.rodata)

6431
src/battle_3.c Normal file
View File

File diff suppressed because it is too large Load Diff

6
src/battle_ai.c
View File

@ -87,7 +87,7 @@ static u8 BattleAI_ChooseMoveOrAction_Singles(void);
static u8 BattleAI_ChooseMoveOrAction_Doubles(void);
static void RecordLastUsedMoveByTarget(void);
static void BattleAI_DoAIProcessing(void);
static void AIStackPushVar(u8 *);
static void AIStackPushVar(const u8 *);
static bool8 AIStackPop(void);
static void BattleAICmd_if_random_less_than(void);
@ -192,7 +192,7 @@ static void BattleAICmd_if_holds_item(void);
// ewram
EWRAM_DATA u8 *gAIScriptPtr = NULL;
EWRAM_DATA const u8 *gAIScriptPtr = NULL;
EWRAM_DATA static u8 sBank_AI = 0;
// const rom data
@ -2902,7 +2902,7 @@ static void BattleAICmd_if_flash_fired(void)
gAIScriptPtr += 6;
}
static void AIStackPushVar(u8 *var)
static void AIStackPushVar(const u8 *var)
{
gBattleResources->AI_ScriptsStack->ptr[gBattleResources->AI_ScriptsStack->size++] = var;
}

6
src/berry.c
View File

@ -807,7 +807,7 @@ const struct Berry gBerries[] =
// unused
void ClearEnigmaBerries(void)
{
CpuFill16(0, &gSaveBlock1Ptr->enigmaBerry, 52 /*FIXME: sizeof(gSaveBlock1Ptr->enigmaBerry)*/);
CpuFill16(0, &gSaveBlock1Ptr->enigmaBerry, 52);
}
void SetEnigmaBerry(u8 *src)
@ -815,7 +815,7 @@ void SetEnigmaBerry(u8 *src)
u32 i;
u8 *dest = (u8*)&gSaveBlock1Ptr->enigmaBerry;
for (i = 0; i < 52 /*FIXME: sizeof(gSaveBlock1Ptr->enigmaBerry)*/; i++)
for (i = 0; i < 52; i++)
dest[i] = src[i];
}
@ -827,7 +827,7 @@ u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry)
dest = (u8*)enigmaBerry;
checksum = 0;
for (i = 0; i < 52 /*FIXME: sizeof(gSaveBlock1Ptr->enigmaBerry)*/ - sizeof(gSaveBlock1Ptr->enigmaBerry.checksum); i++)
for (i = 0; i < 52 - sizeof(gSaveBlock1Ptr->enigmaBerry.checksum); i++)
{
checksum += dest[i];
}

5118
src/field_map_obj.c Executable file
View File

File diff suppressed because it is too large Load Diff

4
src/hall_of_fame.c Normal file
View File

@ -0,0 +1,4 @@
#include "global.h"
#include "hall_of_fame.h"

5
src/malloc.c
View File

@ -38,7 +38,7 @@ void PutMemBlockHeader(void *block, struct MemBlock *prev, struct MemBlock *next
void PutFirstMemBlockHeader(void *block, u32 size)
{
PutMemBlockHeader(block, (struct MemBlock *)block, (struct MemBlock *)block, size - 16);
PutMemBlockHeader(block, (struct MemBlock *)block, (struct MemBlock *)block, size - sizeof(struct MemBlock));
}
void *AllocInternal(void *heapStart, u32 size)
@ -48,6 +48,7 @@ void *AllocInternal(void *heapStart, u32 size)
struct MemBlock *splitBlock;
u32 foundBlockSize;
// Alignment
if (size & 3)
size = 4 * ((size / 4) + 1);
@ -58,7 +59,7 @@ void *AllocInternal(void *heapStart, u32 size)
foundBlockSize = pos->size;
if (foundBlockSize >= size) {
if (foundBlockSize - size <= 31) {
if (foundBlockSize - size < 2 * sizeof(struct MemBlock)) {
// The block isn't much bigger than the requested size,
// so just use it.
pos->flag = TRUE;

20
sym_ewram.txt
View File

@ -346,7 +346,7 @@ gBattleMoveDamage: @ 20241F0
gUnknown_020241F4: @ 20241F4
.space 0x4
gUnknown_020241F8: @ 20241F8
gTakenDmg: @ 20241F8
.space 0x10
gLastUsedItem: @ 2024208
@ -361,10 +361,10 @@ gBankAttacker: @ 202420B
gBankTarget: @ 202420C
.space 0x1
gUnknown_0202420D: @ 202420D
gBank1: @ 202420D
.space 0x1
gUnknown_0202420E: @ 202420E
gEffectBank: @ 202420E
.space 0x1
gStringBank: @ 202420F
@ -412,7 +412,7 @@ gUnknown_02024268: @ 2024268
gUnknown_02024270: @ 2024270
.space 0x4
gUnknown_02024274: @ 2024274
gChosenMovesByBanks: @ 2024274
.space 0x8
gBattleMoveFlags: @ 202427C
@ -424,7 +424,7 @@ gHitMarker: @ 2024280
gUnknown_02024284: @ 2024284
.space 0x4
gUnknown_02024288: @ 2024288
gTakenDmgBanks: @ 2024288
.space 0x4
gUnknown_0202428C: @ 202428C
@ -469,7 +469,7 @@ gSpecialStatuses: @ 202437C
gBattleWeather: @ 20243CC
.space 0x4
gUnknown_020243D0: @ 20243D0
gWishFutureKnock: @ 20243D0
.space 0x2C
gUnknown_020243FC: @ 20243FC
@ -654,7 +654,7 @@ gUnknown_02032304: @ 2032304
gUnknown_02032306: @ 2032306
.space 0x2
gUnknown_02032308: @ 2032308
gLinkPlayerMapObjects: @ 2032308
.space 0x10
gUnknown_02032318: @ 2032318
@ -663,7 +663,7 @@ gUnknown_02032318: @ 2032318
gMapHeader: @ 2037318
.space 0x1C
gUnknown_02037334: @ 2037334
gCamera: @ 2037334
.space 0xC
gUnknown_02037340: @ 2037340
@ -678,7 +678,7 @@ gUnknown_0203734C: @ 203734C
gMapObjects: @ 2037350
.space 0x240
gUnknown_02037590: @ 2037590
gPlayerAvatar: @ 2037590
.space 0x14
gUnknown_020375A4: @ 20375A4
@ -902,7 +902,7 @@ gUnknown_02038C00: @ 2038C00
gUnknown_02038C04: @ 2038C04
.space 0x4
gUnknown_02038C08: @ 2038C08
gFieldEffectSpawnParams: @ 2038C08
.space 0x20
gUnknown_02038C28: @ 2038C28