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.

Sign up for GitHub

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

Jump to bottom

Decompile overlay_12_0226BEC4, make HeapID into a proper enum #148

Merged
merged 13 commits into from
Jun 6, 2023
Merged

Decompile overlay_12_0226BEC4, make HeapID into a proper enum #148

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8660536
Make HeapID an enum
adrienntindall Jun 3, 2023
02c7656
Decompile overlay_12_0226BEC4
adrienntindall Jun 3, 2023
952271e
Removed accidently commited files
adrienntindall Jun 3, 2023
60fdb37
overlay_12_0226BBC4 -> battle_finger
adrienntindall Jun 3, 2023
6e1c87f
Merge branch 'master' into master
adrienntindall Jun 4, 2023
7818a8a
Fix warnings caused by merge
adrienntindall Jun 4, 2023
9849bf0
Battle cursor 1, fix requested changes
adrienntindall Jun 5, 2023
9a3760b
decompile overlay_12_0226B8FC -> battle_cursor.c
adrienntindall Jun 5, 2023
18b3c56
Some battle documentation
adrienntindall Jun 5, 2023
10ee7dc
Some more documentation
adrienntindall Jun 5, 2023
c5e7412
Added second set of requested changes
adrienntindall Jun 5, 2023
eda37c4
int -> s32
adrienntindall Jun 5, 2023
7655a2d
Revert "int -> s32"
adrienntindall Jun 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion asm/battle_setup.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ sub_02051AAC: ; 0x02051AAC
str r0, [sp, #0x18]
mov r0, #8
add r1, r6, #0
bl String_ctor
bl String_New
add r7, r0, #0
ldr r0, [sp, #0x10]
bl PlayerProfile_GetTrainerGender
Expand Down
2 changes: 1 addition & 1 deletion asm/include/battle_setup.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
.public AllocFromHeap
.public FreeToHeap
.public GF_AssertFail
.public String_ctor
.public String_New
.public String_dtor
.public String_c_str
.public GetStoragePCPointer
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021EDAFC.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
.public FillWindowPixelRect
.public AddTextPrinterParameterized
.public GF_AssertFail
.public String_ctor
.public String_New
.public String_dtor
.public Sav2_PlayerData_GetProfileAddr
.public Sav2_PlayerData_GetCoinsAddr
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021EF7A0.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
.public BlitBitmapRectToWindow
.public AddTextPrinterParameterized2
.public GF_AssertFail
.public String_ctor
.public String_New
.public String_dtor
.public MapHeader_GetMapSec
.public MapHeader_GetAreaIcon
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021F6CFC.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
.public WindowIsInUse
.public RemoveWindow
.public TextPrinterCheckActive
.public String_ctor
.public String_New
.public String_dtor
.public Sav2_PlayerData_GetOptionsAddr
.public PlayerProfile_new
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021F8D80.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
.public MapObjectMan_SetFlagsBits
.public MapObjectMan_ClearFlagsBits
.public MapObjectMan_GetFlagsBitsMask
.public sub_0205F19C
.public MapObjectMan_GetHeapID
.public sub_0205F1A0
.public FldObjSys_SetMModelNarc
.public FldObjSys_GetMModelNarc
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021F944C.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
.public sub_0205EEF4
.public sub_0205F09C
.public MapObjectMan_GetCount
.public sub_0205F19C
.public MapObjectMan_GetHeapID
.public sub_0205F1A0
.public sub_0205F1AC
.public sub_0205F1C4
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021FC66C.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
.public sub_0201F988
.public LCRandom
.public GF_AssertFail
.public String_ctor
.public String_New
.public String_dtor
.public Sav2_PlayerData_GetOptionsAddr
.public Sav2_GameStats_get
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021FD41C.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
.public GF_RTC_GetTimeOfDay
.public sub_0205F09C
.public sub_0205F0F8
.public sub_0205F19C
.public MapObjectMan_GetHeapID
.public MapObject_TestFlagsBits
.public MapObject_GetID
.public sub_0205F254
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_02.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
.public Set2dSpriteAnimSeqNo
.public sub_02024ADC
.public GF_AssertFail
.public String_ctor
.public String_New
.public String_dtor
.public Sav2_SysInfo_RTC_get
.public Sav2_PlayerData_GetProfileAddr
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_03.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
.public sub_02024B68
.public System_GetTouchNew
.public GF_AssertFail
.public String_ctor
.public String_New
.public String_dtor
.public String16_FormatInteger
.public Sav2_PlayerData_GetProfileAddr
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_05.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
.public Camera_SetClipBounds
.public sub_020249B0
.public GF_AssertFail
.public String_ctor
.public String_New
.public String_dtor
.public Thunk_G3X_Reset
.public GF_3DVramMan_Create
Expand Down
12 changes: 6 additions & 6 deletions asm/include/overlay_08.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
.public GX_EngineBToggleLayers
.public sub_02025224
.public System_GetTouchNew
.public String_ctor
.public String_New
.public String_dtor
.public GetMonData
.public GetMonExpBySpeciesAndLevel
Expand Down Expand Up @@ -187,11 +187,11 @@
.public ov12_0226BA28
.public ov12_0226BAFC
.public ov12_0226BB68
.public ov12_0226BBC4
.public ov12_0226BC40
.public ov12_0226BC68
.public ov12_0226BCE4
.public BattleFinger_LoadResources
.public BattleFinger_FreeResources
.public BattleFinger_New
.public BattleFinger_Delete
.public ov12_0226BD2C
.public ov12_0226BD38
.public BattleFinger_Disable
.public ov12_0226BD4C
.public ov12_0226BD50
2 changes: 1 addition & 1 deletion asm/include/overlay_101.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
.public sub_0202539C
.public sub_020253F0
.public GF_AssertFail
.public String_ctor
.public String_New
.public String_dtor
.public StringSetEmpty
.public StringCountLines
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_102.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
.public System_GetTouchNew
.public sub_020253F0
.public GF_AssertFail
.public String_ctor
.public String_New
.public String_dtor
.public StringCountLines
.public StringGetLineN
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_103.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
.public sub_02024B1C
.public sub_02025224
.public System_GetTouchNew
.public String_ctor
.public String_New
.public String_dtor
.public CopyU16ArrayToString
.public Sav2_PlayerData_GetOptionsAddr
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_108.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
.public System_GetTouchHeld
.public System_GetTouchNew
.public GF_AssertFail
.public String_ctor
.public String_New
.public String_dtor
.public Thunk_G3X_Reset
.public GF_3DVramMan_InitLinkedListTexVramManager
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_109.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
.public sub_02024A04
.public sub_02024B68
.public sub_02025224
.public String_ctor
.public String_New
.public String_dtor
.public CopyU16ArrayToString
.public Sav2_PlayerData_GetProfileAddr
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_110.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
.public sub_02025224
.public System_GetTouchHeld
.public System_GetTouchNew
.public String_ctor
.public String_New
.public String_dtor
.public Sav2_PlayerData_GetOptionsAddr
.public Options_GetTextFrameDelay
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_112.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
.public sub_02025224
.public sub_02025320
.public GF_AssertFail
.public String_ctor
.public String_New
.public String_dtor
.public StringCopy
.public StringGetLength
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_113.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
.public sub_02024A04
.public sub_02024B68
.public sub_0202529C
.public String_ctor
.public String_New
.public String_dtor
.public Sav2_PlayerData_GetProfileAddr
.public Sav2_PlayerData_GetOptionsAddr
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_115.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
.public Set2dSpriteAnimSeqNo
.public sub_02024A04
.public sub_02024B34
.public String_ctor
.public String_New
.public String_dtor
.public Thunk_G3X_Reset
.public sub_02026E50
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_117.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
.public Set2dSpriteVisibleFlag
.public sub_02024A04
.public sub_02024B78
.public String_ctor
.public String_New
.public String_dtor
.public G2x_SetBlendAlpha_
.public memset
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_121.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
.public System_GetTouchHeld
.public System_GetTouchNew
.public GF_AssertFail
.public String_ctor
.public String_New
.public String_dtor
.public Sav2_PlayerData_GetOptionsAddr
.public Options_GetFrame
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_124.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
.public FlyPoints_GetPosition
.public Save_FlyPoints_get
.public FsysUnkSub108_Alloc
.public BagCursor_new
.public BagCursor_New
.public sub_02092BB8
.public GearPhoneRingManager_new
.public FS_LoadOverlay
Expand Down
8 changes: 4 additions & 4 deletions asm/include/overlay_12_022378C0.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
.public GX_EngineBToggleLayers
.public GX_BothDispOn
.public GF_AssertFail
.public String_ctor
.public String_New
.public String_dtor
.public sub_02026E50
.public sub_02026E84
Expand Down Expand Up @@ -226,9 +226,9 @@
.public ov12_0223BFC0
.public ov12_0223BFCC
.public ov12_0223BFEC
.public ov12_02248660
.public ov12_022486B0
.public ov12_022486FC
.public BattleContext_New
.public BattleMain
.public BattleContext_Delete
.public ov12_02256F28
.public ov12_022581D4
.public ov12_022582B8
Expand Down
10 changes: 5 additions & 5 deletions asm/include/overlay_12_0224E4FC.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
.public ov12_0223BAF8
.public BattleSys_Random
.public ov12_0223BFEC
.public ov12_0224E4FC
.public BattleSystem_GetBattleMon
.public BattleController_EmitRefreshMonData
.public ReadBattleScriptFromNarc
.public ov12_0224EBDC
Expand All @@ -75,8 +75,8 @@
.public SetBattlerVar
.public ov12_0224F794
.public ov12_0224FC48
.public ov12_02250360
.public ov12_02250370
.public BattleSystem_ClearExperienceEarnFlags
.public BattleSystem_SetExperienceEarnFlags
.public ov12_022503EC
.public ov12_02250490
.public ov12_022506D4
Expand All @@ -87,7 +87,7 @@
.public UnlockBattlerOutOfCurrentMove
.public ov12_02250CFC
.public ov12_02250D4C
.public ov12_02250F44
.public BattleContext_Init
.public ov12_02251038
.public InitSwitchWork
.public InitFaintedWork
Expand Down Expand Up @@ -140,7 +140,7 @@
.public ov12_0225561C
.public CheckItemEffectOnHit
.public GetBattlerHeldItemEffect
.public ov12_02255844
.public BattleSystem_GetHeldItemDamageBoost
.public GetNaturalGiftPower
.public GetNaturalGiftType
.public ov12_022558F8
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_12_02264824.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
.public sub_020249D4
.public sub_02024B1C
.public GF_AssertFail
.public String_ctor
.public String_New
.public String_dtor
.public Mon_GetBoxMon
.public sub_02088080
Expand Down
10 changes: 5 additions & 5 deletions asm/include/overlay_12_02266024.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
.public sub_02024B1C
.public sub_02025224
.public GF_AssertFail
.public String_ctor
.public String_New
.public String_dtor
.public GetMonData
.public GetMonGender
Expand Down Expand Up @@ -178,10 +178,10 @@
.public ov12_0226BB40
.public ov12_0226BB68
.public ov12_0226BB84
.public ov12_0226BBC4
.public ov12_0226BC40
.public ov12_0226BC68
.public ov12_0226BCE4
.public BattleFinger_LoadResources
.public BattleFinger_FreeResources
.public BattleFinger_New
.public BattleFinger_Delete
.public ov12_0226BCFC
.public ov12_0226BD4C
.public ov12_0226BD50
10 changes: 5 additions & 5 deletions asm/include/overlay_12_0226BBC4.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
.public _ll_mul
.public _s32_div_f
.public ov12_022399BC
.public ov12_0226BBC4
.public ov12_0226BC40
.public ov12_0226BC68
.public ov12_0226BCE4
.public BattleFinger_LoadResources
.public BattleFinger_FreeResources
.public BattleFinger_New
.public BattleFinger_Delete
.public ov12_0226BCFC
.public ov12_0226BD2C
.public ov12_0226BD38
.public BattleFinger_Disable
.public ov12_0226BD4C
.public ov12_0226BD50
20 changes: 0 additions & 20 deletions asm/include/overlay_12_0226BEC4.inc
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions asm/include/overlay_12_battle_controller.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
.public ov12_0223B688
.public ov12_0223B6B4
.public ov12_0223B854
.public ov12_0223BD14
.public BattleSystem_GetWinLoseFlags
.public ov12_0223BDC4
.public ov12_0223BE68
.public ov12_0223C140
Expand Down Expand Up @@ -80,7 +80,7 @@
.public BattleController_EmitDrawYesNoBox
.public BattleController_EmitPrintAttackMessage
.public BattleController_EmitPrintMessage
.public ov12_0226340C
.public BattleController_SetMoveEffect
.public ov12_0226343C
.public BattleController_EmitMonFlicker
.public BattleController_EmitHealthbarUpdate
Expand Down
Loading