mirror of
https://github.com/pret/pmd-sky.git
synced 2026-03-21 17:25:15 -05:00
Merge pull request #158 from DizzyEggg/test
Some checks failed
build / build (push) Has been cancelled
Some checks failed
build / build (push) Has been cancelled
decompile ov10_022C434C
This commit is contained in:
commit
5874668e8e
|
|
@ -45,8 +45,8 @@
|
|||
.public UnloadFile
|
||||
.public UnloadOverlay
|
||||
.public UnloadWte
|
||||
.public UpdateInventoryMenu
|
||||
.public _020B0A5C
|
||||
.public ov10_022C434C
|
||||
.public ov10_022DC094
|
||||
.public ov10_022DC0B8
|
||||
.public ov10_022DC0D4
|
||||
|
|
|
|||
2
asm/include/overlay_10_022C4394.inc
Normal file
2
asm/include/overlay_10_022C4394.inc
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
#pragma once
|
||||
.public UpdateInventoryMenu
|
||||
|
|
@ -2136,340 +2136,3 @@ _022C4340:
|
|||
strb r0, [r6]
|
||||
ldmia sp!, {r3, r4, r5, r6, r7, pc}
|
||||
arm_func_end ov10_022C42F4
|
||||
|
||||
arm_func_start ov10_022C434C
|
||||
ov10_022C434C: ; 0x022C434C
|
||||
ldr ip, [sp, #4]
|
||||
cmp r0, #0
|
||||
movlt r0, ip
|
||||
bxlt lr
|
||||
cmp r1, #0
|
||||
movlt r0, ip
|
||||
bxlt lr
|
||||
cmp r0, r2
|
||||
movge r0, ip
|
||||
bxge lr
|
||||
cmp r1, r3
|
||||
mlalt r0, r1, r2, r0
|
||||
ldrlt r1, [sp]
|
||||
movlt r0, r0, lsl #1
|
||||
ldrlth r0, [r1, r0]
|
||||
andlt ip, r0, #3
|
||||
mov r0, ip
|
||||
bx lr
|
||||
arm_func_end ov10_022C434C
|
||||
; 0x022C4394
|
||||
|
||||
.rodata
|
||||
.global INVENTORY_MENU_DEFAULT_WINDOW_PARAMS
|
||||
INVENTORY_MENU_DEFAULT_WINDOW_PARAMS:
|
||||
.word UpdateInventoryMenu
|
||||
.byte 0x1E, 0x0F, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.global ov10_022C43A4
|
||||
ov10_022C43A4:
|
||||
.byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x6A, 0x00, 0x01, 0x00, 0x00, 0x00
|
||||
.global ov10_022C43B0
|
||||
ov10_022C43B0:
|
||||
.byte 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x02, 0x02, 0x12, 0x11, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.global ov10_022C43C0
|
||||
ov10_022C43C0:
|
||||
.byte 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x0C, 0x02, 0x12, 0x06, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.global ov10_022C43D0
|
||||
ov10_022C43D0:
|
||||
.byte 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x02, 0x02, 0x12, 0x06, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.global ov10_022C43E0
|
||||
ov10_022C43E0:
|
||||
.byte 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x0C, 0x02, 0x12, 0x11, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.global ov10_022C43F0
|
||||
ov10_022C43F0:
|
||||
.byte 0x25, 0x64, 0x25, 0x73
|
||||
.byte 0x00, 0x00, 0x00, 0x00
|
||||
.global ov10_022C43F8
|
||||
ov10_022C43F8:
|
||||
.byte 0x5B, 0x4D, 0x53, 0x3A, 0x31, 0x5D, 0x25, 0x73, 0x00, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4404
|
||||
ov10_022C4404:
|
||||
.byte 0x20, 0x20, 0x3F, 0x3F, 0x3F, 0x00, 0x00, 0x00
|
||||
.global FIRST_DUNGEON_WITH_MONSTER_HOUSE_TRAPS
|
||||
FIRST_DUNGEON_WITH_MONSTER_HOUSE_TRAPS:
|
||||
.byte 0x1C, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4410
|
||||
ov10_022C4410:
|
||||
.byte 0xC8, 0x00, 0x00, 0x00
|
||||
.global BAD_POISON_DAMAGE_COOLDOWN
|
||||
BAD_POISON_DAMAGE_COOLDOWN:
|
||||
.byte 0x05, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4418
|
||||
ov10_022C4418:
|
||||
.byte 0x14, 0x00, 0x00, 0x00
|
||||
.global ov10_022C441C
|
||||
ov10_022C441C:
|
||||
.byte 0xC8, 0x00, 0x00, 0x00
|
||||
.global PROTEIN_STAT_BOOST
|
||||
PROTEIN_STAT_BOOST:
|
||||
.byte 0x03, 0x00, 0x00, 0x00
|
||||
.global WATERFALL_CRINGE_CHANCE
|
||||
WATERFALL_CRINGE_CHANCE:
|
||||
.byte 0x1E, 0x00, 0x00, 0x00
|
||||
.global AURORA_BEAM_LOWER_ATTACK_CHANCE
|
||||
AURORA_BEAM_LOWER_ATTACK_CHANCE:
|
||||
.byte 0x3C, 0x00, 0x00, 0x00
|
||||
.global ov10_022C442C
|
||||
ov10_022C442C:
|
||||
.byte 0x21, 0x00, 0x00, 0x00
|
||||
.global SPAWN_CAP_NO_MONSTER_HOUSE
|
||||
SPAWN_CAP_NO_MONSTER_HOUSE:
|
||||
.byte 0x0F, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4434
|
||||
ov10_022C4434:
|
||||
.byte 0x1E, 0x00, 0x00, 0x00
|
||||
.global OREN_BERRY_DAMAGE
|
||||
OREN_BERRY_DAMAGE:
|
||||
.byte 0x0A, 0x00, 0x00, 0x00
|
||||
.global ov10_022C443C
|
||||
ov10_022C443C:
|
||||
.byte 0xC9, 0x00, 0x00, 0x00
|
||||
.global IRON_TAIL_LOWER_DEFENSE_CHANCE
|
||||
IRON_TAIL_LOWER_DEFENSE_CHANCE:
|
||||
.byte 0x1E, 0x00, 0x00, 0x00
|
||||
.global TWINEEDLE_POISON_CHANCE
|
||||
TWINEEDLE_POISON_CHANCE:
|
||||
.byte 0x14, 0x00, 0x00, 0x00
|
||||
.global EXTRASENSORY_CRINGE_CHANCE
|
||||
EXTRASENSORY_CRINGE_CHANCE:
|
||||
.byte 0x0F, 0x00, 0x00, 0x00
|
||||
.global ROCK_SLIDE_CRINGE_CHANCE
|
||||
ROCK_SLIDE_CRINGE_CHANCE:
|
||||
.byte 0x1E, 0x00, 0x00, 0x00
|
||||
.global CRUNCH_LOWER_DEFENSE_CHANCE
|
||||
CRUNCH_LOWER_DEFENSE_CHANCE:
|
||||
.byte 0x14, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4454
|
||||
ov10_022C4454:
|
||||
.byte 0x02, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4458
|
||||
ov10_022C4458:
|
||||
.byte 0x0A, 0x00, 0x00, 0x00
|
||||
.global TRAP_BUSTER_ACTIVATION_CHANCE
|
||||
TRAP_BUSTER_ACTIVATION_CHANCE:
|
||||
.byte 0x1E, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4460
|
||||
ov10_022C4460:
|
||||
.byte 0x0C, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4464
|
||||
ov10_022C4464:
|
||||
.byte 0x18, 0x00, 0x00, 0x00
|
||||
.global FOREWARN_FORCED_MISS_CHANCE
|
||||
FOREWARN_FORCED_MISS_CHANCE:
|
||||
.byte 0x14, 0x00, 0x00, 0x00
|
||||
.global ov10_022C446C
|
||||
ov10_022C446C:
|
||||
.byte 0x05, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4470
|
||||
ov10_022C4470:
|
||||
.byte 0x0F, 0x00, 0x00, 0x00
|
||||
.global UNOWN_STONE_DROP_CHANCE
|
||||
UNOWN_STONE_DROP_CHANCE:
|
||||
.byte 0x21, 0x00, 0x00, 0x00
|
||||
.global SITRUS_BERRY_HP_RESTORATION
|
||||
SITRUS_BERRY_HP_RESTORATION:
|
||||
.byte 0x64, 0x00, 0x00, 0x00
|
||||
.global ov10_022C447C
|
||||
ov10_022C447C:
|
||||
.byte 0x96, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4480
|
||||
ov10_022C4480:
|
||||
.byte 0x14, 0x00, 0x00, 0x00
|
||||
.global MUDDY_WATER_LOWER_ACCURACY_CHANCE
|
||||
MUDDY_WATER_LOWER_ACCURACY_CHANCE:
|
||||
.byte 0x28, 0x00, 0x00, 0x00
|
||||
.global SILVER_WIND_BOOST_CHANCE
|
||||
SILVER_WIND_BOOST_CHANCE:
|
||||
.byte 0x14, 0x00, 0x00, 0x00
|
||||
.global POISON_TAIL_POISON_CHANCE
|
||||
POISON_TAIL_POISON_CHANCE:
|
||||
.byte 0x0A, 0x00, 0x00, 0x00
|
||||
.global THUNDERSHOCK_PARALYZE_CHANCE
|
||||
THUNDERSHOCK_PARALYZE_CHANCE:
|
||||
.byte 0x0A, 0x00, 0x00, 0x00
|
||||
.global BOUNCE_PARALYZE_CHANCE
|
||||
BOUNCE_PARALYZE_CHANCE:
|
||||
.byte 0x1E, 0x00, 0x00, 0x00
|
||||
.global HEADBUTT_CRINGE_CHANCE
|
||||
HEADBUTT_CRINGE_CHANCE:
|
||||
.byte 0x19, 0x00, 0x00, 0x00
|
||||
.global FIRE_FANG_CRINGE_CHANCE
|
||||
FIRE_FANG_CRINGE_CHANCE:
|
||||
.byte 0x19, 0x00, 0x00, 0x00
|
||||
.global SACRED_FIRE_BURN_CHANCE
|
||||
SACRED_FIRE_BURN_CHANCE:
|
||||
.byte 0x32, 0x00, 0x00, 0x00
|
||||
.global WHIRLPOOL_CONSTRICTION_CHANCE
|
||||
WHIRLPOOL_CONSTRICTION_CHANCE:
|
||||
.byte 0x0A, 0x00, 0x00, 0x00
|
||||
.global EXP_ELITE_EXP_BOOST
|
||||
EXP_ELITE_EXP_BOOST:
|
||||
.byte 0x0A, 0x00, 0x00, 0x00
|
||||
.global MONSTER_HOUSE_MAX_NON_MONSTER_SPAWNS
|
||||
MONSTER_HOUSE_MAX_NON_MONSTER_SPAWNS:
|
||||
.byte 0x07, 0x00, 0x00, 0x00
|
||||
.global ov10_022C44B0
|
||||
ov10_022C44B0:
|
||||
.byte 0x0A, 0x00, 0x00, 0x00
|
||||
.global ov10_022C44B4
|
||||
ov10_022C44B4:
|
||||
.byte 0x05, 0x00, 0x00, 0x00
|
||||
.global HEAL_ORDER_HP_RESTORATION
|
||||
HEAL_ORDER_HP_RESTORATION:
|
||||
.byte 0x28, 0x00, 0x00, 0x00
|
||||
.global ov10_022C44BC
|
||||
ov10_022C44BC:
|
||||
.byte 0x03, 0x00, 0x00, 0x00
|
||||
.global ov10_022C44C0
|
||||
ov10_022C44C0:
|
||||
.byte 0x0A, 0x00, 0x00, 0x00
|
||||
.global STEEL_WING_BOOST_DEFENSE_CHANCE
|
||||
STEEL_WING_BOOST_DEFENSE_CHANCE:
|
||||
.byte 0x14, 0x00, 0x00, 0x00
|
||||
.global ov10_022C44C8
|
||||
ov10_022C44C8:
|
||||
.byte 0x19, 0x00, 0x00, 0x00
|
||||
.global ov10_022C44CC
|
||||
ov10_022C44CC:
|
||||
.byte 0x19, 0x00, 0x00, 0x00
|
||||
.global GOLD_THORN_POWER
|
||||
GOLD_THORN_POWER:
|
||||
.byte 0x14, 0x00, 0x00, 0x00
|
||||
.global BURN_DAMAGE
|
||||
BURN_DAMAGE:
|
||||
.byte 0x06, 0x00, 0x00, 0x00
|
||||
.global POISON_DAMAGE
|
||||
POISON_DAMAGE:
|
||||
.byte 0x02, 0x00, 0x00, 0x00
|
||||
.global SPAWN_COOLDOWN
|
||||
SPAWN_COOLDOWN:
|
||||
.byte 0x24, 0x00, 0x00, 0x00
|
||||
.global MIST_BALL_LOWER_SPECIAL_ATTACK_CHANCE
|
||||
MIST_BALL_LOWER_SPECIAL_ATTACK_CHANCE:
|
||||
.byte 0x32, 0x00, 0x00, 0x00
|
||||
.global ov10_022C44E4
|
||||
ov10_022C44E4:
|
||||
.byte 0x05, 0x00, 0x00, 0x00
|
||||
.global ov10_022C44E8
|
||||
ov10_022C44E8:
|
||||
.byte 0x23, 0x00, 0x00, 0x00
|
||||
.global ov10_022C44EC
|
||||
ov10_022C44EC:
|
||||
.byte 0x3C, 0x00, 0x00, 0x00
|
||||
.global CHARGE_BEAM_BOOST_SPECIAL_ATTACK_CHANCE
|
||||
CHARGE_BEAM_BOOST_SPECIAL_ATTACK_CHANCE:
|
||||
.byte 0x28, 0x00, 0x00, 0x00
|
||||
.global ORAN_BERRY_FULL_HP_BOOST
|
||||
ORAN_BERRY_FULL_HP_BOOST:
|
||||
.byte 0x00, 0x00, 0x00, 0x00
|
||||
.global LIFE_SEED_HP_BOOST
|
||||
LIFE_SEED_HP_BOOST:
|
||||
.byte 0x03, 0x00, 0x00, 0x00
|
||||
.global ov10_022C44FC
|
||||
ov10_022C44FC:
|
||||
.byte 0x32, 0x00, 0x00, 0x00
|
||||
.global OCTAZOOKA_LOWER_ACCURACY_CHANCE
|
||||
OCTAZOOKA_LOWER_ACCURACY_CHANCE:
|
||||
.byte 0x3C, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4504
|
||||
ov10_022C4504:
|
||||
.byte 0x14, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4508
|
||||
ov10_022C4508:
|
||||
.byte 0x14, 0x00, 0x00, 0x00
|
||||
.global LUSTER_PURGE_LOWER_SPECIAL_DEFENSE_CHANCE
|
||||
LUSTER_PURGE_LOWER_SPECIAL_DEFENSE_CHANCE:
|
||||
.byte 0x32, 0x00, 0x00, 0x00
|
||||
.global SUPER_LUCK_CRIT_RATE_BOOST
|
||||
SUPER_LUCK_CRIT_RATE_BOOST:
|
||||
.byte 0x0A, 0x00, 0x00, 0x00
|
||||
.global CONSTRICT_LOWER_SPEED_CHANCE
|
||||
CONSTRICT_LOWER_SPEED_CHANCE:
|
||||
.byte 0x14, 0x00, 0x00, 0x00
|
||||
.global ICE_FANG_FREEZE_CHANCE
|
||||
ICE_FANG_FREEZE_CHANCE:
|
||||
.byte 0x0F, 0x00, 0x00, 0x00
|
||||
.global SMOG_POISON_CHANCE
|
||||
SMOG_POISON_CHANCE:
|
||||
.byte 0x28, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4520
|
||||
ov10_022C4520:
|
||||
.byte 0x19, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4524
|
||||
ov10_022C4524:
|
||||
.byte 0x0C, 0x00, 0x00, 0x00
|
||||
.global LICK_PARALYZE_CHANCE
|
||||
LICK_PARALYZE_CHANCE:
|
||||
.byte 0x0F, 0x00, 0x00, 0x00
|
||||
.global THUNDER_FANG_PARALYZE_CHANCE
|
||||
THUNDER_FANG_PARALYZE_CHANCE:
|
||||
.byte 0x0A, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4530
|
||||
ov10_022C4530:
|
||||
.byte 0x0F, 0x00, 0x00, 0x00
|
||||
.global BITE_CRINGE_CHANCE
|
||||
BITE_CRINGE_CHANCE:
|
||||
.byte 0x14, 0x00, 0x00, 0x00
|
||||
.global SKY_ATTACK_CRINGE_CHANCE
|
||||
SKY_ATTACK_CRINGE_CHANCE:
|
||||
.byte 0x19, 0x00, 0x00, 0x00
|
||||
.global ICE_FANG_CRINGE_CHANCE
|
||||
ICE_FANG_CRINGE_CHANCE:
|
||||
.byte 0x19, 0x00, 0x00, 0x00
|
||||
.global BLAZE_KICK_BURN_CHANCE
|
||||
BLAZE_KICK_BURN_CHANCE:
|
||||
.byte 0x0A, 0x00, 0x00, 0x00
|
||||
.global FLAMETHROWER_BURN_CHANCE
|
||||
FLAMETHROWER_BURN_CHANCE:
|
||||
.byte 0x0A, 0x00, 0x00, 0x00
|
||||
.global DIZZY_PUNCH_CONFUSE_CHANCE
|
||||
DIZZY_PUNCH_CONFUSE_CHANCE:
|
||||
.byte 0x1E, 0x00, 0x00, 0x00
|
||||
.global SECRET_POWER_EFFECT_CHANCE
|
||||
SECRET_POWER_EFFECT_CHANCE:
|
||||
.byte 0x1E, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4550
|
||||
ov10_022C4550:
|
||||
.byte 0x0C, 0x00, 0x00, 0x00
|
||||
.global METAL_CLAW_BOOST_ATTACK_CHANCE
|
||||
METAL_CLAW_BOOST_ATTACK_CHANCE:
|
||||
.byte 0x14, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4558
|
||||
ov10_022C4558:
|
||||
.byte 0x01, 0x00, 0x00, 0x00
|
||||
.global TECHNICIAN_MOVE_POWER_THRESHOLD
|
||||
TECHNICIAN_MOVE_POWER_THRESHOLD:
|
||||
.byte 0x04, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4560
|
||||
ov10_022C4560:
|
||||
.byte 0x08, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4564
|
||||
ov10_022C4564:
|
||||
.byte 0x0C, 0x00, 0x00, 0x00
|
||||
.global SONICBOOM_FIXED_DAMAGE
|
||||
SONICBOOM_FIXED_DAMAGE:
|
||||
.byte 0x14, 0x00, 0x00, 0x00
|
||||
.global ov10_022C456C
|
||||
ov10_022C456C:
|
||||
.byte 0x12, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4570
|
||||
ov10_022C4570:
|
||||
.byte 0x05, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4574
|
||||
ov10_022C4574:
|
||||
.byte 0x02, 0x00, 0x00, 0x00
|
||||
.global RAIN_ABILITY_BONUS_REGEN
|
||||
RAIN_ABILITY_BONUS_REGEN:
|
||||
.byte 0x6A, 0xFF, 0x00, 0x00
|
||||
.global ov10_022C457C
|
||||
ov10_022C457C:
|
||||
.byte 0x03, 0x00, 0x00, 0x00
|
||||
|
|
|
|||
319
asm/overlay_10_022C4394.s
Normal file
319
asm/overlay_10_022C4394.s
Normal file
|
|
@ -0,0 +1,319 @@
|
|||
.include "asm/macros.inc"
|
||||
.include "overlay_10_022C4394.inc"
|
||||
|
||||
.text
|
||||
; 0x022C4394
|
||||
|
||||
.rodata
|
||||
.global INVENTORY_MENU_DEFAULT_WINDOW_PARAMS
|
||||
INVENTORY_MENU_DEFAULT_WINDOW_PARAMS:
|
||||
.word UpdateInventoryMenu
|
||||
.byte 0x1E, 0x0F, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.global ov10_022C43A4
|
||||
ov10_022C43A4:
|
||||
.byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x6A, 0x00, 0x01, 0x00, 0x00, 0x00
|
||||
.global ov10_022C43B0
|
||||
ov10_022C43B0:
|
||||
.byte 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x02, 0x02, 0x12, 0x11, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.global ov10_022C43C0
|
||||
ov10_022C43C0:
|
||||
.byte 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x0C, 0x02, 0x12, 0x06, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.global ov10_022C43D0
|
||||
ov10_022C43D0:
|
||||
.byte 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x02, 0x02, 0x12, 0x06, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.global ov10_022C43E0
|
||||
ov10_022C43E0:
|
||||
.byte 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x0C, 0x02, 0x12, 0x11, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.global ov10_022C43F0
|
||||
ov10_022C43F0:
|
||||
.byte 0x25, 0x64, 0x25, 0x73
|
||||
.byte 0x00, 0x00, 0x00, 0x00
|
||||
.global ov10_022C43F8
|
||||
ov10_022C43F8:
|
||||
.byte 0x5B, 0x4D, 0x53, 0x3A, 0x31, 0x5D, 0x25, 0x73, 0x00, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4404
|
||||
ov10_022C4404:
|
||||
.byte 0x20, 0x20, 0x3F, 0x3F, 0x3F, 0x00, 0x00, 0x00
|
||||
.global FIRST_DUNGEON_WITH_MONSTER_HOUSE_TRAPS
|
||||
FIRST_DUNGEON_WITH_MONSTER_HOUSE_TRAPS:
|
||||
.byte 0x1C, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4410
|
||||
ov10_022C4410:
|
||||
.byte 0xC8, 0x00, 0x00, 0x00
|
||||
.global BAD_POISON_DAMAGE_COOLDOWN
|
||||
BAD_POISON_DAMAGE_COOLDOWN:
|
||||
.byte 0x05, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4418
|
||||
ov10_022C4418:
|
||||
.byte 0x14, 0x00, 0x00, 0x00
|
||||
.global ov10_022C441C
|
||||
ov10_022C441C:
|
||||
.byte 0xC8, 0x00, 0x00, 0x00
|
||||
.global PROTEIN_STAT_BOOST
|
||||
PROTEIN_STAT_BOOST:
|
||||
.byte 0x03, 0x00, 0x00, 0x00
|
||||
.global WATERFALL_CRINGE_CHANCE
|
||||
WATERFALL_CRINGE_CHANCE:
|
||||
.byte 0x1E, 0x00, 0x00, 0x00
|
||||
.global AURORA_BEAM_LOWER_ATTACK_CHANCE
|
||||
AURORA_BEAM_LOWER_ATTACK_CHANCE:
|
||||
.byte 0x3C, 0x00, 0x00, 0x00
|
||||
.global ov10_022C442C
|
||||
ov10_022C442C:
|
||||
.byte 0x21, 0x00, 0x00, 0x00
|
||||
.global SPAWN_CAP_NO_MONSTER_HOUSE
|
||||
SPAWN_CAP_NO_MONSTER_HOUSE:
|
||||
.byte 0x0F, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4434
|
||||
ov10_022C4434:
|
||||
.byte 0x1E, 0x00, 0x00, 0x00
|
||||
.global OREN_BERRY_DAMAGE
|
||||
OREN_BERRY_DAMAGE:
|
||||
.byte 0x0A, 0x00, 0x00, 0x00
|
||||
.global ov10_022C443C
|
||||
ov10_022C443C:
|
||||
.byte 0xC9, 0x00, 0x00, 0x00
|
||||
.global IRON_TAIL_LOWER_DEFENSE_CHANCE
|
||||
IRON_TAIL_LOWER_DEFENSE_CHANCE:
|
||||
.byte 0x1E, 0x00, 0x00, 0x00
|
||||
.global TWINEEDLE_POISON_CHANCE
|
||||
TWINEEDLE_POISON_CHANCE:
|
||||
.byte 0x14, 0x00, 0x00, 0x00
|
||||
.global EXTRASENSORY_CRINGE_CHANCE
|
||||
EXTRASENSORY_CRINGE_CHANCE:
|
||||
.byte 0x0F, 0x00, 0x00, 0x00
|
||||
.global ROCK_SLIDE_CRINGE_CHANCE
|
||||
ROCK_SLIDE_CRINGE_CHANCE:
|
||||
.byte 0x1E, 0x00, 0x00, 0x00
|
||||
.global CRUNCH_LOWER_DEFENSE_CHANCE
|
||||
CRUNCH_LOWER_DEFENSE_CHANCE:
|
||||
.byte 0x14, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4454
|
||||
ov10_022C4454:
|
||||
.byte 0x02, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4458
|
||||
ov10_022C4458:
|
||||
.byte 0x0A, 0x00, 0x00, 0x00
|
||||
.global TRAP_BUSTER_ACTIVATION_CHANCE
|
||||
TRAP_BUSTER_ACTIVATION_CHANCE:
|
||||
.byte 0x1E, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4460
|
||||
ov10_022C4460:
|
||||
.byte 0x0C, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4464
|
||||
ov10_022C4464:
|
||||
.byte 0x18, 0x00, 0x00, 0x00
|
||||
.global FOREWARN_FORCED_MISS_CHANCE
|
||||
FOREWARN_FORCED_MISS_CHANCE:
|
||||
.byte 0x14, 0x00, 0x00, 0x00
|
||||
.global ov10_022C446C
|
||||
ov10_022C446C:
|
||||
.byte 0x05, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4470
|
||||
ov10_022C4470:
|
||||
.byte 0x0F, 0x00, 0x00, 0x00
|
||||
.global UNOWN_STONE_DROP_CHANCE
|
||||
UNOWN_STONE_DROP_CHANCE:
|
||||
.byte 0x21, 0x00, 0x00, 0x00
|
||||
.global SITRUS_BERRY_HP_RESTORATION
|
||||
SITRUS_BERRY_HP_RESTORATION:
|
||||
.byte 0x64, 0x00, 0x00, 0x00
|
||||
.global ov10_022C447C
|
||||
ov10_022C447C:
|
||||
.byte 0x96, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4480
|
||||
ov10_022C4480:
|
||||
.byte 0x14, 0x00, 0x00, 0x00
|
||||
.global MUDDY_WATER_LOWER_ACCURACY_CHANCE
|
||||
MUDDY_WATER_LOWER_ACCURACY_CHANCE:
|
||||
.byte 0x28, 0x00, 0x00, 0x00
|
||||
.global SILVER_WIND_BOOST_CHANCE
|
||||
SILVER_WIND_BOOST_CHANCE:
|
||||
.byte 0x14, 0x00, 0x00, 0x00
|
||||
.global POISON_TAIL_POISON_CHANCE
|
||||
POISON_TAIL_POISON_CHANCE:
|
||||
.byte 0x0A, 0x00, 0x00, 0x00
|
||||
.global THUNDERSHOCK_PARALYZE_CHANCE
|
||||
THUNDERSHOCK_PARALYZE_CHANCE:
|
||||
.byte 0x0A, 0x00, 0x00, 0x00
|
||||
.global BOUNCE_PARALYZE_CHANCE
|
||||
BOUNCE_PARALYZE_CHANCE:
|
||||
.byte 0x1E, 0x00, 0x00, 0x00
|
||||
.global HEADBUTT_CRINGE_CHANCE
|
||||
HEADBUTT_CRINGE_CHANCE:
|
||||
.byte 0x19, 0x00, 0x00, 0x00
|
||||
.global FIRE_FANG_CRINGE_CHANCE
|
||||
FIRE_FANG_CRINGE_CHANCE:
|
||||
.byte 0x19, 0x00, 0x00, 0x00
|
||||
.global SACRED_FIRE_BURN_CHANCE
|
||||
SACRED_FIRE_BURN_CHANCE:
|
||||
.byte 0x32, 0x00, 0x00, 0x00
|
||||
.global WHIRLPOOL_CONSTRICTION_CHANCE
|
||||
WHIRLPOOL_CONSTRICTION_CHANCE:
|
||||
.byte 0x0A, 0x00, 0x00, 0x00
|
||||
.global EXP_ELITE_EXP_BOOST
|
||||
EXP_ELITE_EXP_BOOST:
|
||||
.byte 0x0A, 0x00, 0x00, 0x00
|
||||
.global MONSTER_HOUSE_MAX_NON_MONSTER_SPAWNS
|
||||
MONSTER_HOUSE_MAX_NON_MONSTER_SPAWNS:
|
||||
.byte 0x07, 0x00, 0x00, 0x00
|
||||
.global ov10_022C44B0
|
||||
ov10_022C44B0:
|
||||
.byte 0x0A, 0x00, 0x00, 0x00
|
||||
.global ov10_022C44B4
|
||||
ov10_022C44B4:
|
||||
.byte 0x05, 0x00, 0x00, 0x00
|
||||
.global HEAL_ORDER_HP_RESTORATION
|
||||
HEAL_ORDER_HP_RESTORATION:
|
||||
.byte 0x28, 0x00, 0x00, 0x00
|
||||
.global ov10_022C44BC
|
||||
ov10_022C44BC:
|
||||
.byte 0x03, 0x00, 0x00, 0x00
|
||||
.global ov10_022C44C0
|
||||
ov10_022C44C0:
|
||||
.byte 0x0A, 0x00, 0x00, 0x00
|
||||
.global STEEL_WING_BOOST_DEFENSE_CHANCE
|
||||
STEEL_WING_BOOST_DEFENSE_CHANCE:
|
||||
.byte 0x14, 0x00, 0x00, 0x00
|
||||
.global ov10_022C44C8
|
||||
ov10_022C44C8:
|
||||
.byte 0x19, 0x00, 0x00, 0x00
|
||||
.global ov10_022C44CC
|
||||
ov10_022C44CC:
|
||||
.byte 0x19, 0x00, 0x00, 0x00
|
||||
.global GOLD_THORN_POWER
|
||||
GOLD_THORN_POWER:
|
||||
.byte 0x14, 0x00, 0x00, 0x00
|
||||
.global BURN_DAMAGE
|
||||
BURN_DAMAGE:
|
||||
.byte 0x06, 0x00, 0x00, 0x00
|
||||
.global POISON_DAMAGE
|
||||
POISON_DAMAGE:
|
||||
.byte 0x02, 0x00, 0x00, 0x00
|
||||
.global SPAWN_COOLDOWN
|
||||
SPAWN_COOLDOWN:
|
||||
.byte 0x24, 0x00, 0x00, 0x00
|
||||
.global MIST_BALL_LOWER_SPECIAL_ATTACK_CHANCE
|
||||
MIST_BALL_LOWER_SPECIAL_ATTACK_CHANCE:
|
||||
.byte 0x32, 0x00, 0x00, 0x00
|
||||
.global ov10_022C44E4
|
||||
ov10_022C44E4:
|
||||
.byte 0x05, 0x00, 0x00, 0x00
|
||||
.global ov10_022C44E8
|
||||
ov10_022C44E8:
|
||||
.byte 0x23, 0x00, 0x00, 0x00
|
||||
.global ov10_022C44EC
|
||||
ov10_022C44EC:
|
||||
.byte 0x3C, 0x00, 0x00, 0x00
|
||||
.global CHARGE_BEAM_BOOST_SPECIAL_ATTACK_CHANCE
|
||||
CHARGE_BEAM_BOOST_SPECIAL_ATTACK_CHANCE:
|
||||
.byte 0x28, 0x00, 0x00, 0x00
|
||||
.global ORAN_BERRY_FULL_HP_BOOST
|
||||
ORAN_BERRY_FULL_HP_BOOST:
|
||||
.byte 0x00, 0x00, 0x00, 0x00
|
||||
.global LIFE_SEED_HP_BOOST
|
||||
LIFE_SEED_HP_BOOST:
|
||||
.byte 0x03, 0x00, 0x00, 0x00
|
||||
.global ov10_022C44FC
|
||||
ov10_022C44FC:
|
||||
.byte 0x32, 0x00, 0x00, 0x00
|
||||
.global OCTAZOOKA_LOWER_ACCURACY_CHANCE
|
||||
OCTAZOOKA_LOWER_ACCURACY_CHANCE:
|
||||
.byte 0x3C, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4504
|
||||
ov10_022C4504:
|
||||
.byte 0x14, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4508
|
||||
ov10_022C4508:
|
||||
.byte 0x14, 0x00, 0x00, 0x00
|
||||
.global LUSTER_PURGE_LOWER_SPECIAL_DEFENSE_CHANCE
|
||||
LUSTER_PURGE_LOWER_SPECIAL_DEFENSE_CHANCE:
|
||||
.byte 0x32, 0x00, 0x00, 0x00
|
||||
.global SUPER_LUCK_CRIT_RATE_BOOST
|
||||
SUPER_LUCK_CRIT_RATE_BOOST:
|
||||
.byte 0x0A, 0x00, 0x00, 0x00
|
||||
.global CONSTRICT_LOWER_SPEED_CHANCE
|
||||
CONSTRICT_LOWER_SPEED_CHANCE:
|
||||
.byte 0x14, 0x00, 0x00, 0x00
|
||||
.global ICE_FANG_FREEZE_CHANCE
|
||||
ICE_FANG_FREEZE_CHANCE:
|
||||
.byte 0x0F, 0x00, 0x00, 0x00
|
||||
.global SMOG_POISON_CHANCE
|
||||
SMOG_POISON_CHANCE:
|
||||
.byte 0x28, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4520
|
||||
ov10_022C4520:
|
||||
.byte 0x19, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4524
|
||||
ov10_022C4524:
|
||||
.byte 0x0C, 0x00, 0x00, 0x00
|
||||
.global LICK_PARALYZE_CHANCE
|
||||
LICK_PARALYZE_CHANCE:
|
||||
.byte 0x0F, 0x00, 0x00, 0x00
|
||||
.global THUNDER_FANG_PARALYZE_CHANCE
|
||||
THUNDER_FANG_PARALYZE_CHANCE:
|
||||
.byte 0x0A, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4530
|
||||
ov10_022C4530:
|
||||
.byte 0x0F, 0x00, 0x00, 0x00
|
||||
.global BITE_CRINGE_CHANCE
|
||||
BITE_CRINGE_CHANCE:
|
||||
.byte 0x14, 0x00, 0x00, 0x00
|
||||
.global SKY_ATTACK_CRINGE_CHANCE
|
||||
SKY_ATTACK_CRINGE_CHANCE:
|
||||
.byte 0x19, 0x00, 0x00, 0x00
|
||||
.global ICE_FANG_CRINGE_CHANCE
|
||||
ICE_FANG_CRINGE_CHANCE:
|
||||
.byte 0x19, 0x00, 0x00, 0x00
|
||||
.global BLAZE_KICK_BURN_CHANCE
|
||||
BLAZE_KICK_BURN_CHANCE:
|
||||
.byte 0x0A, 0x00, 0x00, 0x00
|
||||
.global FLAMETHROWER_BURN_CHANCE
|
||||
FLAMETHROWER_BURN_CHANCE:
|
||||
.byte 0x0A, 0x00, 0x00, 0x00
|
||||
.global DIZZY_PUNCH_CONFUSE_CHANCE
|
||||
DIZZY_PUNCH_CONFUSE_CHANCE:
|
||||
.byte 0x1E, 0x00, 0x00, 0x00
|
||||
.global SECRET_POWER_EFFECT_CHANCE
|
||||
SECRET_POWER_EFFECT_CHANCE:
|
||||
.byte 0x1E, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4550
|
||||
ov10_022C4550:
|
||||
.byte 0x0C, 0x00, 0x00, 0x00
|
||||
.global METAL_CLAW_BOOST_ATTACK_CHANCE
|
||||
METAL_CLAW_BOOST_ATTACK_CHANCE:
|
||||
.byte 0x14, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4558
|
||||
ov10_022C4558:
|
||||
.byte 0x01, 0x00, 0x00, 0x00
|
||||
.global TECHNICIAN_MOVE_POWER_THRESHOLD
|
||||
TECHNICIAN_MOVE_POWER_THRESHOLD:
|
||||
.byte 0x04, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4560
|
||||
ov10_022C4560:
|
||||
.byte 0x08, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4564
|
||||
ov10_022C4564:
|
||||
.byte 0x0C, 0x00, 0x00, 0x00
|
||||
.global SONICBOOM_FIXED_DAMAGE
|
||||
SONICBOOM_FIXED_DAMAGE:
|
||||
.byte 0x14, 0x00, 0x00, 0x00
|
||||
.global ov10_022C456C
|
||||
ov10_022C456C:
|
||||
.byte 0x12, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4570
|
||||
ov10_022C4570:
|
||||
.byte 0x05, 0x00, 0x00, 0x00
|
||||
.global ov10_022C4574
|
||||
ov10_022C4574:
|
||||
.byte 0x02, 0x00, 0x00, 0x00
|
||||
.global RAIN_ABILITY_BONUS_REGEN
|
||||
RAIN_ABILITY_BONUS_REGEN:
|
||||
.byte 0x6A, 0xFF, 0x00, 0x00
|
||||
.global ov10_022C457C
|
||||
ov10_022C457C:
|
||||
.byte 0x03, 0x00, 0x00, 0x00
|
||||
6
include/overlay_10_022C434C.h
Normal file
6
include/overlay_10_022C434C.h
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
#ifndef PMDSKY_OVERLAY_10_022C434C_H
|
||||
#define PMDSKY_OVERLAY_10_022C434C_H
|
||||
|
||||
s32 ov10_022C434C(s32 a0, s32 a1, s32 a2, s32 a3, u16 *a4, s32 a5);
|
||||
|
||||
#endif //PMDSKY_OVERLAY_10_022C434C_H
|
||||
2
main.lsf
2
main.lsf
|
|
@ -171,6 +171,8 @@ Overlay OVY_10
|
|||
Object asm/overlay_10_022BCC7C.o
|
||||
Object src/overlay_10_022C2574.o
|
||||
Object asm/overlay_10_022C2588.o
|
||||
Object src/overlay_10_022C434C.o
|
||||
Object asm/overlay_10_022C4394.o
|
||||
Object src/dungeon_parameters.o
|
||||
Object asm/overlay_10_rodata_022C4584.o
|
||||
Object src/dungeon_parameters_1.o
|
||||
|
|
|
|||
17
src/overlay_10_022C434C.c
Normal file
17
src/overlay_10_022C434C.c
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
#include "overlay_10_022C434C.h"
|
||||
|
||||
// sub_80ADF8C - Red
|
||||
s32 ov10_022C434C(s32 a0, s32 a1, s32 a2, s32 a3, u16 *a4, s32 a5)
|
||||
{
|
||||
s32 ret = a5;
|
||||
if (a0 < 0)
|
||||
return ret;
|
||||
if (a1 < 0)
|
||||
return ret;
|
||||
if (a0 >= a2)
|
||||
return ret;
|
||||
if (a1 < a3) {
|
||||
ret = a4[a0 + (a1 * a2)] & 3;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user