Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Decomped AiDecideUseItem #108

Merged
merged 4 commits into from
Dec 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions asm/include/itcm.inc
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
.public _022A3538
.public _022A353C
.public _022A3554
.public _022A35DC
.public _022A35E8
.public _022A3614
.public _022A3620
Expand Down Expand Up @@ -81,7 +80,6 @@
.public _022A3804
.public _022A3805
.public _022A3806
.public _022A88DC
.public _022A88F0
.public _022A88FC
.public _022B966C
Expand Down Expand Up @@ -175,7 +173,9 @@
.public sub_02080EF0
.public sub_02080F30
.public sub_02080F30
.public TOUCHSCREEN_STATUS
.public TRIG_TABLE
.public TryAddTargetToAiTargetList
.public UpdateAiTargetPos
.public UpdateWindow
.public WINDOW_LIST
2 changes: 1 addition & 1 deletion asm/include/main_02000DE0.inc
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
.public _020B3384
.public _020B33A0
.public _020B33C0
.public _020B4BC0
.public _0229AFC0
.public _0229AFCC
.public _0229AFE4
Expand All @@ -47,6 +46,7 @@
.public CardPullOut
.public Debug_FatalError
.public Debug_Print0
.public DEFAULT_MEMORY_ARENA_MEMORY
.public GetHeldButtons
.public GetReleasedStylus
.public GX_DispOff
Expand Down
2 changes: 1 addition & 1 deletion asm/include/main_02003DB8.inc
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
.public _022A3538
.public _022A353C
.public _022A3554
.public _022A35DC
.public _022A35E8
.public _022A3614
.public _022A3620
Expand Down Expand Up @@ -124,3 +123,4 @@
.public sub_020845F8
.public sub_020850B4
.public sub_02085180
.public TOUCHSCREEN_STATUS
2 changes: 1 addition & 1 deletion asm/include/main_0200C4CC.inc
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
.public _020AF6C4
.public _020AF6C8
.public _020AFF88_EU
.public _022A3824
.public AllKecleonShopsZInit
.public AllocateTemp1024ByteBufferFromPool
.public ARM9_UNKNOWN_TABLE__NA_2097FF8
.public AVAILABLE_ITEMS_IN_GROUP_TABLE
.public BAG_ITEMS
.public BAG_ITEMS_PTR_MIRROR
.public CopyBitsFrom
.public CopyBitsTo
Expand Down
2 changes: 1 addition & 1 deletion asm/include/main_0200ED1C.inc
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,6 @@
.public _022A4BEC
.public _022A4C00
.public _022A4C28
.public _022A4C50
.public _022A4E50
.public _022A4E58
.public _022A4E7C
Expand Down Expand Up @@ -297,6 +296,7 @@
.public AreItemsEquivalent
.public ArrayCopy32
.public ArrayFill32
.public AUDIO_COMMANDS_BUFFER
.public BAG_ITEMS_PTR_MIRROR
.public BulkItemToItem
.public CALCIUM_STAT_BOOST
Expand Down
12 changes: 6 additions & 6 deletions asm/include/main_0202598C.inc
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@
.public _022A7B00
.public _022A7B1C
.public _022A7EDC
.public _022A88DC
.public _022A88E4
.public _022A88F0
.public _022A88F8
Expand All @@ -104,20 +103,20 @@
.public _022A92C4
.public _022A9A5C
.public _022AA35C
.public _022AAC64
.public _022AAC68
.public _022AAC80
.public _022AACFC
.public _022AAD78
.public _022AAD7C
.public _s32_div_f
.public ADVANCED_MENU_DEFAULT_WINDOW_PARAMS
.public ADVANCED_TEXT_BOX_DEFAULT_WINDOW_PARAMS
.public ALERT_ANIMATION_CONTROL
.public ALERT_BOX_DEFAULT_WINDOW_PARAMS
.public ALERT_SPRITE_ID
.public AnalyzeText
.public AREA_NAME_BOX_DEFAULT_WINDOW_PARAMS
.public COLLECTION_MENU_DEFAULT_WINDOW_PARAMS
.public CONTROLS_CHART_DEFAULT_WINDOW_PARAMS
.public CURSOR_16_ANIMATION_CONTROL
.public CURSOR_16_SPRITE_ID
.public CURSOR_ANIMATION_CONTROL
.public DEBUG_MENU_DEFAULT_WINDOW_PARAMS
.public DecompressAtHalf
.public DIALOGUE_BOX_DEFAULT_WINDOW_PARAMS
Expand Down Expand Up @@ -216,3 +215,4 @@
.public UnloadFile
.public UnloadOverlay
.public WAN_TABLE
.public WINDOW_LIST
20 changes: 10 additions & 10 deletions asm/include/main_02034974.inc
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,6 @@
.public _022AAE00
.public _022AAE2A
.public _022AAE2E
.public _022AAE4C
.public _022AAE58
.public _022AAE64
.public _022AAE68
Expand All @@ -303,22 +302,13 @@
.public _022AB0A1
.public _022AB0A2
.public _022AB0A9
.public _022AB0AC
.public _022AB4AC
.public _022AB4B0
.public _022AB4F8
.public _022AB4FC
.public _022AB510
.public _022AB518
.public _022AB5A8
.public _022AB5AC
.public _022AB694
.public _022AB69C
.public _022AB918
.public _022AB924
.public _022AB92C
.public _022AB930
.public _022ABDE0
.public _f2d
.public _fsub
.public _s32_div_f
Expand Down Expand Up @@ -391,6 +381,7 @@
.public Debug_Print0
.public Debug_SetDebugFlag
.public Debug_SetLogFlag
.public DEBUG_SPECIAL_EPISODE_NUMBER
.public DecompressAtNormalVeneer
.public DEFAULT_HERO_ID
.public DexNumbersEqual
Expand Down Expand Up @@ -513,8 +504,12 @@
.public IsValidTeamMember
.public ItemZInit
.public KAOMADO_FILEPATH
.public KAOMADO_STREAM
.public KEYBOARD_STRING_IDS
.public LAST_NEW_MOVE
.public LearnMoves
.public LEVEL_UP_DATA_DECOMPRESS_BUFFER
.public LEVEL_UP_DATA_MONSTER_ID
.public LoadFileFromRom
.public LoadOverlay
.public MemAlloc
Expand Down Expand Up @@ -548,6 +543,8 @@
.public ov29_02347100
.public OverlayIsLoaded
.public PARTNER_TALK_KIND_TABLE
.public PENDING_DUNGEON_ID
.public PLAY_TIME_SECONDS
.public PlayAdvancedTextBoxInputSound
.public PlayBgmByIdVeneer
.public PlaySeVolumeWrapper
Expand All @@ -570,6 +567,7 @@
.public ResumeAdvancedMenu
.public SCRIPT_VARS
.public SCRIPT_VARS_LOCALS
.public SCRIPT_VARS_VALUES
.public SECONDARY_TERRAIN_TYPES
.public SetActiveInventory
.public SetActiveKecleonShop
Expand Down Expand Up @@ -801,7 +799,9 @@
.public sub_02083B14
.public sub_02083B3C
.public sub_02084304
.public TEAM_MEMBER_TABLE
.public TEAM_MEMBER_TABLE_PTR
.public TEAM_NAME
.public TryPointCameraToMonster
.public UnloadFile
.public UNOWN_SPECIES_ADDITIONAL_CHAR_PTR_TABLE
Expand Down
2 changes: 1 addition & 1 deletion asm/include/main_02075600.inc
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
.public _022B9618
.public _022B961C
.public _022B9644
.public _022B9648
.public _022B9654
.public _022B966C
.public _022B9670
Expand Down Expand Up @@ -91,5 +90,6 @@
.public sub_02084A4C
.public sub_02085BD4
.public SVC_WaitByLoop
.public THREAD_INFO_STRUCT
.public WaitForever2
.public WaitForInterrupt
2 changes: 1 addition & 1 deletion asm/include/overlay_29_022F62CC.inc
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
.public IsFloorOver
.public IsShaymin
.public IsShoppableItem
.public LOADED_ATTACK_SPRITE_DATA
.public LOADED_ATTACK_SPRITE_FILE_INDEX
.public LoadMissionMonsterSprites
.public LoadMonsterSprite
Expand All @@ -48,7 +49,6 @@
.public ov29_0234B09C
.public ov29_02352760
.public ov29_023535A8
.public ov29_0237C9AC
.public ov29_0237C9B0
.public RemoveGroundItem
.public SpawnItem
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_29_023085DC.inc
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@
.public ov29_0231EDFC
.public ov29_023380FC
.public ov29_023535DC
.public ov29_0237CA6D
.public RAPID_SPIN_BINDING_REMOVAL
.public ResetDamageData
.public UpdateAiTargetPos
25 changes: 0 additions & 25 deletions asm/include/overlay_29_0230E914.inc

This file was deleted.

12 changes: 12 additions & 0 deletions asm/include/overlay_29_0230EDB0.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#pragma once
.public abs
.public AI_THROWN_ITEM_ACTION_CHOICE_COUNT
.public AI_THROWN_ITEM_DIRECTION_IS_USED
.public AI_THROWN_ITEM_DIRECTIONS
.public AI_THROWN_ITEM_PROBABILITIES
.public CanSeeTarget
.public DUNGEON_PTR
.public EntityIsValid__0230F008
.public GetAiUseItemProbability
.public GetTreatmentBetweenMonsters
.public IsTargetInRange
2 changes: 1 addition & 1 deletion asm/include/overlay_29_0232145C.inc
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
.public LogMessageByIdWithPopupCheckUser
.public LogMessageWithPopupCheckUser
.public LowerSpeed
.public METRONOME_NEXT_INDEX
.public METRONOME_TABLE
.public NATURE_POWER_TABLE
.public NIGHTMARE_TURN_RANGE
Expand Down Expand Up @@ -64,7 +65,6 @@
.public ov29_0234B084
.public ov29_0235370C
.public ov29_0237CA68
.public ov29_0237CA88
.public SLEEP_TURN_RANGE
.public StringFromId
.public sub_0201D1B0
Expand Down
8 changes: 4 additions & 4 deletions asm/include/overlay_29_02325644.inc
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
.public METEOR_MASH_BOOST_ATTACK_CHANCE
.public MirrorMoveIsActive
.public MORNING_SUN_HP_RESTORATION_TABLE
.public MULTIHIT_FATIGUE_MOVE_USED
.public NIGHTMARE_TURN_RANGE
.public OCTAZOOKA_LOWER_ACCURACY_CHANCE
.public ov10_022BED90
Expand All @@ -77,16 +78,15 @@
.public ov29_0234B034
.public ov29_0234BA54
.public ov29_02352AD8
.public ov29_0237CA69
.public ov29_0237CA6A
.public ov29_0237CA6D
.public ov29_0237CA70
.public POWDER_SNOW_FREEZE_CHANCE
.public PSYBEAM_CONFUSE_CHANCE
.public RAPID_SPIN_BINDING_REMOVAL
.public RAZOR_WIND_DAMAGE_MULTIPLIER
.public REVERSAL_DAMAGE_MULT_TABLE
.public ROCK_SLIDE_CRINGE_CHANCE
.public ROLLOUT_DAMAGE_MULT_TABLE
.public ROLLOUT_ICE_BALL_MISSED
.public ROLLOUT_ICE_BALL_SUCCESSIVE_HITS
.public ShouldDisplayEntityAdvanced
.public SILVER_WIND_BOOST_CHANCE
.public SKY_ATTACK_CRINGE_CHANCE
Expand Down
6 changes: 3 additions & 3 deletions asm/include/overlay_29_02328030.inc
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
.public LowerOffensiveStat
.public MOONLIGHT_HP_RESTORATION_TABLE
.public MUDDY_WATER_LOWER_ACCURACY_CHANCE
.public MULTIHIT_MOVE_SUCCESSIVE_HITS
.public NATURE_POWER_TABLE
.public ov10_022C4E44
.public ov10_022C6324
Expand All @@ -69,9 +70,6 @@
.public ov29_0234B084
.public ov29_0234C738
.public ov29_02352B18
.public ov29_0237CA6B
.public ov29_0237CA78
.public ov29_0237CA7C
.public POISON_FANG_POISON_CHANCE
.public POISON_STING_POISON_CHANCE
.public RemoveEmptyItemsInBagWrapper
Expand All @@ -89,6 +87,7 @@
.public THUNDERBOLT_PARALYZE_CHANCE
.public THUNDERSHOCK_PARALYZE_CHANCE
.public TRI_ATTACK_STATUS_CHANCE
.public TRIPLE_KICK_SUCCESSIVE_HITS
.public TryActivateWeather
.public TryEndStatusWithAbility
.public TryExplosion
Expand All @@ -108,6 +107,7 @@
.public TryInflictTauntStatus
.public TryInflictWishStatus
.public TryWarp
.public TWINEEDLE_HIT_TRACKER
.public TWINEEDLE_POISON_CHANCE
.public TWISTER_CRINGE_CHANCE
.public WATERFALL_CRINGE_CHANCE
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_29_0232A3FC.inc
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
.public LowerSpeed
.public LUSTER_PURGE_LOWER_SPECIAL_DEFENSE_CHANCE
.public METAL_CLAW_BOOST_ATTACK_CHANCE
.public METRONOME_NEXT_INDEX
.public METRONOME_TABLE
.public MIST_BALL_LOWER_SPECIAL_ATTACK_CHANCE
.public MoveMonsterToPos
Expand All @@ -81,7 +82,6 @@
.public ov29_0235171E
.public ov29_02352B1C
.public ov29_0237CA84
.public ov29_0237CA88
.public POISON_TAIL_POISON_CHANCE
.public RemoveEquivItem
.public REST_TURN_RANGE
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_29_0232E864.inc
Original file line number Diff line number Diff line change
Expand Up @@ -418,10 +418,10 @@
.public ov29_0234B034
.public ov29_02353718
.public ov29_0237CA68
.public ov29_0237CA69
.public ov29_0237CA74
.public ov29_0237CA80
.public PlayMoveAnimation
.public ROLLOUT_ICE_BALL_MISSED
.public ShouldDisplayEntityWrapper
.public SPATK_STAT_IDX
.public sub_02050FF8
Expand Down
Loading