From c6a3ee003da1016c181ac5db0b5b6c50d88b9aee Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Tue, 23 Dec 2025 16:49:44 -0300 Subject: [PATCH 1/2] Synced `heap.c/h` structure and names with pokeheartgold and pokeplatinum --- arm9/asm/scrcmd_12.s | 2 +- arm9/asm/unk_02001B80.s | 6 +- arm9/asm/unk_0200E1D0_s.s | 8 +- arm9/asm/unk_0200E850.s | 54 +- arm9/asm/unk_02011744.s | 26 +- arm9/asm/unk_02012004.s | 18 +- arm9/asm/unk_02012944.s | 8 +- arm9/asm/unk_02012CC8.s | 10 +- arm9/asm/unk_02013CD4.s | 16 +- arm9/asm/unk_020144FC.s | 4 +- arm9/asm/unk_02014590.s | 18 +- arm9/asm/unk_02014BF4.s | 12 +- arm9/asm/unk_0201C24C.s | 14 +- arm9/asm/unk_0201C360.s | 8 +- arm9/asm/unk_0201D040.s | 20 +- arm9/asm/unk_0201E00C.s | 8 +- arm9/asm/unk_0201F06C.s | 48 +- arm9/asm/unk_02020C44.s | 26 +- arm9/asm/unk_02022318.s | 12 +- arm9/asm/unk_020250A4.s | 6 +- arm9/asm/unk_02025954.s | 2 +- arm9/asm/unk_02026CD0.s | 2 +- arm9/asm/unk_02027E30.s | 2 +- arm9/asm/unk_02028980.s | 12 +- arm9/asm/unk_0202B870.s | 18 +- arm9/asm/unk_0202D4C4.s | 6 +- arm9/asm/unk_0202D8D0.s | 4 +- arm9/asm/unk_0202DB14.s | 4 +- arm9/asm/unk_02033B68.s | 12 +- arm9/asm/unk_02034A28.s | 4 +- arm9/asm/unk_02035068.s | 90 ++-- arm9/asm/unk_020372D4.s | 18 +- arm9/asm/unk_020377F0.s | 70 +-- arm9/asm/unk_02038C78.s | 12 +- arm9/asm/unk_02046030.s | 4 +- arm9/asm/unk_020476CC.s | 22 +- arm9/asm/unk_020484A8.s | 10 +- arm9/asm/unk_02048904.s | 54 +- arm9/asm/unk_0204A368.s | 4 +- arm9/asm/unk_0204B34C.s | 14 +- arm9/asm/unk_0204B9EC.s | 4 +- arm9/asm/unk_0204C1B4.s | 10 +- arm9/asm/unk_0204CB20.s | 22 +- arm9/asm/unk_0204FBA8.s | 22 +- arm9/asm/unk_02050E48.s | 28 +- arm9/asm/unk_020520AC.s | 16 +- arm9/asm/unk_02052EE8.s | 14 +- arm9/asm/unk_0205363C.s | 4 +- arm9/asm/unk_02053750.s | 32 +- arm9/asm/unk_02054C14.s | 8 +- arm9/asm/unk_0205AD98.s | 4 +- arm9/asm/unk_0205C598.s | 4 +- arm9/asm/unk_0205CE48.s | 30 +- arm9/asm/unk_0205DD18.s | 8 +- arm9/asm/unk_0205EB38.s | 4 +- arm9/asm/unk_0205F7A0.s | 4 +- arm9/asm/unk_020603B0.s | 2 +- arm9/asm/unk_020606B0.s | 8 +- arm9/asm/unk_020607D4.s | 10 +- arm9/asm/unk_02060CCC.s | 6 +- arm9/asm/unk_020625EC.s | 16 +- arm9/asm/unk_02063888.s | 4 +- arm9/asm/unk_020643C0.s | 12 +- arm9/asm/unk_020647A4.s | 6 +- arm9/asm/unk_02064E90.s | 10 +- arm9/asm/unk_020653EC.s | 22 +- arm9/asm/unk_0206BF90.s | 14 +- arm9/asm/unk_0206C700.s | 22 +- arm9/asm/unk_0206DE24.s | 8 +- arm9/asm/unk_0206F1F0.s | 10 +- arm9/asm/unk_0206F3FC.s | 20 +- arm9/asm/unk_02073DA8.s | 4 +- arm9/asm/unk_0207550C.s | 62 +-- arm9/asm/unk_020772F0.s | 22 +- arm9/asm/unk_020799E8.s | 6 +- arm9/asm/unk_02079C70.s | 12 +- arm9/asm/unk_0207D5BC.s | 2 +- arm9/asm/unk_0207FD00.s | 14 +- arm9/asm/unk_02080C38.s | 36 +- arm9/asm/unk_020828BC.s | 18 +- arm9/asm/unk_020834D0.s | 24 +- arm9/asm/unk_020854E0.s | 24 +- arm9/asm/unk_020859C0.s | 20 +- arm9/asm/unk_02086084.s | 10 +- arm9/asm/unk_02086414.s | 10 +- arm9/asm/unk_02087A6C.s | 16 +- arm9/asm/unk_02087D00.s | 32 +- arm9/asm/unk_02088320.s | 18 +- arm9/asm/unk_02088858.s | 4 +- arm9/asm/unk_0208898C.s | 6 +- arm9/asm/unk_02088F0C.s | 4 +- arm9/asm/unk_02089498.s | 6 +- arm9/asm/unk_02089960.s | 6 +- arm9/asm/unk_0208A258.s | 2 +- arm9/asm/unk_0208A338.s | 4 +- arm9/global.inc | 22 +- arm9/overlays/04/asm/ov04_021D74E0.s | 8 +- arm9/overlays/04/asm/ov04_021D868C.s | 4 +- arm9/overlays/05/asm/ov05_021D74E0.s | 18 +- arm9/overlays/05/asm/ov05_021D7F4C.s | 16 +- arm9/overlays/05/asm/ov05_021D9320.s | 14 +- arm9/overlays/05/asm/ov05_021D9A48.s | 14 +- arm9/overlays/05/asm/ov05_021DA5B8.s | 22 +- arm9/overlays/05/asm/ov05_021DB44C.s | 10 +- arm9/overlays/05/asm/ov05_021DB900.s | 12 +- arm9/overlays/05/asm/ov05_021DBA00.s | 4 +- arm9/overlays/05/asm/ov05_021DBABC.s | 4 +- arm9/overlays/05/asm/ov05_021DBEF4.s | 6 +- arm9/overlays/05/asm/ov05_021DC0B8.s | 34 +- arm9/overlays/05/asm/ov05_021E1374.s | 8 +- arm9/overlays/05/asm/ov05_021E1AD8.s | 8 +- arm9/overlays/05/asm/ov05_021E2E88.s | 8 +- arm9/overlays/05/asm/ov05_021E3340.s | 4 +- arm9/overlays/05/asm/ov05_021E3444.s | 54 +- arm9/overlays/05/asm/ov05_021E4AE4.s | 6 +- arm9/overlays/05/asm/ov05_021E5FD8.s | 10 +- arm9/overlays/05/asm/ov05_021E7504.s | 6 +- arm9/overlays/05/asm/ov05_021E7C00.s | 10 +- arm9/overlays/05/asm/ov05_021E80F8.s | 4 +- arm9/overlays/05/asm/ov05_021E8310.s | 8 +- arm9/overlays/05/asm/ov05_021E8860.s | 4 +- arm9/overlays/05/asm/ov05_021E88E8.s | 80 +-- arm9/overlays/05/asm/ov05_021EC458.s | 12 +- arm9/overlays/05/asm/ov05_021EDE34.s | 18 +- arm9/overlays/05/asm/ov05_021EFBF8.s | 6 +- arm9/overlays/05/asm/ov05_021F0318.s | 4 +- arm9/overlays/05/asm/ov05_021F1CB8.s | 4 +- arm9/overlays/05/asm/ov05_021F1F04.s | 30 +- arm9/overlays/05/asm/ov05_021F3780.s | 12 +- arm9/overlays/05/asm/ov05_021F3BC0.s | 8 +- arm9/overlays/05/asm/ov05_021F3FE0.s | 12 +- arm9/overlays/05/asm/ov05_021F445C.s | 8 +- arm9/overlays/05/asm/ov05_021F45B4.s | 4 +- arm9/overlays/05/asm/ov05_021F46C8.s | 4 +- arm9/overlays/05/asm/ov05_021F4968.s | 18 +- arm9/overlays/05/asm/ov05_021F4CF8.s | 6 +- arm9/overlays/05/asm/ov05_021F5268.s | 4 +- arm9/overlays/05/asm/ov05_021F5518.s | 6 +- arm9/overlays/05/asm/ov05_021F5990.s | 16 +- arm9/overlays/05/asm/ov05_021F5C44.s | 10 +- arm9/overlays/05/asm/ov05_021F61F4.s | 4 +- arm9/overlays/05/asm/ov05_021F6360.s | 8 +- arm9/overlays/05/src/ov05_021E72FC.c | 4 +- arm9/overlays/06/asm/overlay_06.s | 286 +++++------ arm9/overlays/07/asm/overlay_07.s | 34 +- arm9/overlays/08/asm/overlay_08.s | 364 +++++++------- arm9/overlays/09/asm/overlay_09.s | 28 +- arm9/overlays/11/asm/ov11_0222D5C0_1.s | 32 +- arm9/overlays/11/asm/ov11_0222D5C0_3.s | 24 +- arm9/overlays/11/asm/ov11_0222FF68.s | 4 +- arm9/overlays/11/asm/ov11_02232264.s | 20 +- arm9/overlays/11/asm/ov11_0223D1DC.s | 6 +- arm9/overlays/11/asm/ov11_0224CA64.s | 4 +- arm9/overlays/11/asm/ov11_0224D550.s | 208 ++++---- arm9/overlays/11/asm/ov11_02256C08.s | 24 +- arm9/overlays/11/asm/ov11_02258428.s | 34 +- arm9/overlays/11/asm/ov11_0225C91C.s | 4 +- arm9/overlays/11/asm/ov11_0225D3EC.s | 4 +- arm9/overlays/11/asm/ov11_0225D6A4.s | 4 +- arm9/overlays/12/asm/overlay_12.s | 404 +++++++-------- arm9/overlays/13/asm/overlay_13_init.s | 4 +- arm9/overlays/14/asm/overlay_14.s | 178 +++---- arm9/overlays/15/asm/overlay_15.s | 56 +-- arm9/overlays/16/asm/overlay_16.s | 616 +++++++++++------------ arm9/overlays/17/asm/overlay_17.s | 114 ++--- arm9/overlays/18/asm/overlay_18.s | 232 ++++----- arm9/overlays/19/src/overlay_19.c | 4 +- arm9/overlays/20/asm/ov20_02252440.s | 12 +- arm9/overlays/20/asm/ov20_02252C5C.s | 10 +- arm9/overlays/20/asm/ov20_022536F4.s | 24 +- arm9/overlays/20/asm/ov20_02253BA4.s | 28 +- arm9/overlays/20/asm/ov20_02254130.s | 10 +- arm9/overlays/21/src/ov21_02254854.c | 6 +- arm9/overlays/21/src/ov21_02254A6C.c | 8 +- arm9/overlays/22/asm/overlay_22.s | 12 +- arm9/overlays/23/asm/overlay_23.s | 14 +- arm9/overlays/24/src/ov24_02254840.c | 6 +- arm9/overlays/24/src/ov24_02254CA0.c | 8 +- arm9/overlays/25/asm/overlay_25.s | 12 +- arm9/overlays/26/asm/ov26_02254854.s | 6 +- arm9/overlays/26/asm/ov26_02254BD4.s | 8 +- arm9/overlays/27/asm/overlay_27.s | 10 +- arm9/overlays/28/asm/overlay_28.s | 12 +- arm9/overlays/29/asm/overlay_29.s | 14 +- arm9/overlays/30/asm/overlay_30.s | 10 +- arm9/overlays/31/asm/overlay_31.s | 10 +- arm9/overlays/32/asm/overlay_32.s | 10 +- arm9/overlays/33/asm/ov33_02254854.s | 6 +- arm9/overlays/33/asm/ov33_022549AC.s | 4 +- arm9/overlays/34/asm/overlay_34.s | 10 +- arm9/overlays/35/asm/overlay_35.s | 10 +- arm9/overlays/36/asm/overlay_36.s | 10 +- arm9/overlays/37/asm/overlay_37.s | 10 +- arm9/overlays/38/asm/overlay_38.s | 10 +- arm9/overlays/39/asm/overlay_39.s | 10 +- arm9/overlays/40/asm/overlay_40.s | 10 +- arm9/overlays/41/asm/overlay_41.s | 10 +- arm9/overlays/42/asm/overlay_42.s | 10 +- arm9/overlays/43/asm/overlay_43.s | 10 +- arm9/overlays/44/asm/ov44_02254854.s | 6 +- arm9/overlays/44/asm/ov44_02254A54.s | 4 +- arm9/overlays/45/asm/overlay_45.s | 10 +- arm9/overlays/46/asm/ov46_02254854.s | 6 +- arm9/overlays/46/asm/ov46_022549AC.s | 4 +- arm9/overlays/47/asm/overlay_47.s | 10 +- arm9/overlays/48/asm/overlay_48.s | 10 +- arm9/overlays/49/asm/overlay_49.s | 10 +- arm9/overlays/50/asm/ov50_02254854.s | 6 +- arm9/overlays/50/asm/ov50_022549AC.s | 6 +- arm9/overlays/51/asm/overlay_51.s | 4 +- arm9/overlays/52/include/overlay_52.h | 2 +- arm9/overlays/52/src/overlay_52.c | 18 +- arm9/overlays/53/asm/overlay_53.s | 12 +- arm9/overlays/54/asm/overlay_54.s | 32 +- arm9/overlays/55/asm/overlay_55.s | 22 +- arm9/overlays/56/asm/overlay_56.s | 12 +- arm9/overlays/57/asm/overlay_57.s | 24 +- arm9/overlays/58/asm/overlay_58.s | 6 +- arm9/overlays/59/include/ov59_Intro.h | 2 +- arm9/overlays/59/include/ov59_TV.h | 2 +- arm9/overlays/59/src/ov59_Intro.c | 150 +++--- arm9/overlays/59/src/ov59_TV.c | 40 +- arm9/overlays/60/asm/overlay_60.s | 20 +- arm9/overlays/61/asm/overlay_61.s | 22 +- arm9/overlays/62/asm/overlay_62.s | 8 +- arm9/overlays/63/asm/ov63_021D74E0.s | 12 +- arm9/overlays/63/asm/ov63_021D8890.s | 32 +- arm9/overlays/63/asm/ov63_021DAE5C.s | 12 +- arm9/overlays/63/src/ov63_021DB450.c | 8 +- arm9/overlays/64/asm/overlay_64.s | 20 +- arm9/overlays/65/asm/overlay_65.s | 12 +- arm9/overlays/66/asm/overlay_66.s | 42 +- arm9/overlays/67/asm/overlay_67.s | 8 +- arm9/overlays/68/asm/overlay_68.s | 14 +- arm9/overlays/69/asm/overlay_69.s | 50 +- arm9/overlays/70/asm/overlay_70.s | 24 +- arm9/overlays/71/asm/overlay_71.s | 22 +- arm9/overlays/73/asm/overlay_73.s | 30 +- arm9/overlays/74/asm/overlay_74.s | 8 +- arm9/overlays/75/asm/overlay_75.s | 16 +- arm9/overlays/76/asm/overlay_76.s | 6 +- arm9/overlays/77/asm/overlay_77.s | 20 +- arm9/overlays/78/asm/overlay_78.s | 10 +- arm9/overlays/80/asm/overlay_80.s | 66 +-- arm9/overlays/81/asm/overlay_81.s | 128 ++--- arm9/overlays/82/asm/overlay_82.s | 10 +- arm9/overlays/83/asm/overlay_83.s | 98 ++-- arm9/overlays/84/asm/overlay_84_thumb1.s | 16 +- arm9/overlays/84/asm/overlay_84_thumb2.s | 62 +-- arm9/overlays/85/asm/overlay_85.s | 80 +-- arm9/overlays/86/asm/overlay_86.s | 6 +- arm9/src/bag.c | 54 +- arm9/src/bag_view.c | 20 +- arm9/src/bg_window.c | 74 +-- arm9/src/blackout.c | 8 +- arm9/src/camera.c | 16 +- arm9/src/communication_error.c | 20 +- arm9/src/easy_chat.c | 10 +- arm9/src/encounter.c | 22 +- arm9/src/error_message_reset.c | 6 +- arm9/src/field_move.c | 16 +- arm9/src/field_move_environment.c | 4 +- arm9/src/filesystem.c | 32 +- arm9/src/font.c | 18 +- arm9/src/game_init.c | 18 +- arm9/src/gf_gfx_loader.c | 104 ++-- arm9/src/heap.c | 201 ++++---- arm9/src/itemtool.c | 26 +- arm9/src/list_menu.c | 10 +- arm9/src/list_menu_items.c | 26 +- arm9/src/mail.c | 8 +- arm9/src/mail_message.c | 12 +- arm9/src/map_matrix.c | 16 +- arm9/src/map_object.c | 16 +- arm9/src/message_format.c | 122 ++--- arm9/src/move_relearner.c | 14 +- arm9/src/msgdata.c | 104 ++-- arm9/src/nutdata.c | 24 +- arm9/src/oam.c | 28 +- arm9/src/options.c | 4 +- arm9/src/overlay_manager.c | 12 +- arm9/src/palette.c | 38 +- arm9/src/party.c | 8 +- arm9/src/player_avatar.c | 4 +- arm9/src/player_data.c | 8 +- arm9/src/pokedex.c | 4 +- arm9/src/pokemon.c | 66 +-- arm9/src/render_window.c | 106 ++-- arm9/src/sav_chatot.c | 4 +- arm9/src/save.c | 22 +- arm9/src/save_data_read_error.c | 28 +- arm9/src/save_data_write_error.c | 14 +- arm9/src/scrcmd.c | 70 +-- arm9/src/scrcmd_13.c | 6 +- arm9/src/scrcmd_move_relearner.c | 10 +- arm9/src/scrcmd_names.c | 6 +- arm9/src/scrcmd_party.c | 2 +- arm9/src/script_pokemon_util.c | 14 +- arm9/src/task.c | 16 +- arm9/src/text.c | 12 +- arm9/src/trainer_data.c | 26 +- arm9/src/unk_020040F4.c | 6 +- arm9/src/unk_020051F4.c | 34 +- arm9/src/unk_020061E8.c | 6 +- arm9/src/unk_02006D98.c | 36 +- arm9/src/unk_02008AA4.c | 10 +- arm9/src/unk_02008DEC.c | 158 +++--- arm9/src/unk_0200BB14.c | 102 ++-- arm9/src/unk_02021590.c | 38 +- arm9/src/unk_02021934.c | 10 +- arm9/src/unk_02021FF8.c | 12 +- arm9/src/unk_02022504.c | 4 +- arm9/src/unk_020254B8.c | 6 +- arm9/src/unk_0202A1E0.c | 4 +- arm9/src/unk_0202E29C.c | 12 +- arm9/src/unk_0202F150.c | 20 +- arm9/src/unk_02031480.c | 6 +- arm9/src/unk_02031734.c | 48 +- arm9/src/unk_020337E8.c | 6 +- arm9/src/unk_0204AEA8.c | 4 +- arm9/src/unk_0204AF24.c | 2 +- arm9/src/unk_0205FA2C.c | 30 +- arm9/src/unk_0206015C.c | 8 +- arm9/src/unk_02064E4C.c | 4 +- arm9/src/unk_020851B8.c | 4 +- arm9/src/unk_02085338.c | 6 +- arm9/src/unk_0208890C.c | 8 +- arm9/src/unk_02088AAC.c | 22 +- arm9/src/unk_0208A300.c | 6 +- arm9/src/use_item_on_mon.c | 102 ++-- arm9/src/wfc_user_info_warning.c | 16 +- include/bag.h | 14 +- include/bag_cursor.h | 2 +- include/bag_view.h | 6 +- include/bg_window.h | 16 +- include/camera.h | 4 +- include/communication_error.h | 2 +- include/constants/heap.h | 91 ++++ include/easy_chat.h | 4 +- include/encounter.h | 2 +- include/field_move_environment.h | 2 +- include/filesystem.h | 14 +- include/font.h | 8 +- include/game_init.h | 4 +- include/gf_gfx_loader.h | 32 +- include/heap.h | 56 +-- include/itemtool.h | 10 +- include/list_menu.h | 4 +- include/list_menu_cursor.h | 2 +- include/list_menu_items.h | 4 +- include/mail.h | 6 +- include/mail_message.h | 4 +- include/map_matrix.h | 2 +- include/message_format.h | 8 +- include/move_relearner.h | 4 +- include/msgdata.h | 16 +- include/nutdata.h | 12 +- include/oam.h | 10 +- include/options.h | 2 +- include/overlay_manager.h | 4 +- include/palette.h | 12 +- include/party.h | 2 +- include/player_data.h | 4 +- include/pokedex.h | 2 +- include/pokemon.h | 10 +- include/render_window.h | 20 +- include/sav_chatot.h | 2 +- include/save.h | 2 +- include/save_data_read_error.h | 4 +- include/save_data_write_error.h | 2 +- include/script_pokemon_util.h | 4 +- include/string16.h | 4 +- include/trainer_data.h | 8 +- include/unk_020040F4.h | 2 +- include/unk_020051F4.h | 6 +- include/unk_020061E8.h | 2 +- include/unk_02006D98.h | 4 +- include/unk_02008AA4.h | 2 +- include/unk_02008DEC.h | 58 +-- include/unk_0200BB14.h | 24 +- include/unk_02021590.h | 12 +- include/unk_02021FF8.h | 2 +- include/unk_02022504.h | 2 +- include/unk_020254B8.h | 2 +- include/unk_0202A1E0.h | 2 +- include/unk_02031480.h | 2 +- include/unk_020337E8.h | 2 +- include/unk_0205FA2C.h | 4 +- include/unk_02064E4C.h | 2 +- include/unk_020851B8.h | 2 +- include/unk_02085338.h | 2 +- include/unk_0208890C.h | 4 +- include/unk_02088AAC.h | 2 +- include/unk_0208A300.h | 2 +- include/use_item_on_mon.h | 10 +- include/wfc_user_info_warning.h | 2 +- 396 files changed, 4602 insertions(+), 4528 deletions(-) create mode 100644 include/constants/heap.h diff --git a/arm9/asm/scrcmd_12.s b/arm9/asm/scrcmd_12.s index fef042675..28cc62793 100644 --- a/arm9/asm/scrcmd_12.s +++ b/arm9/asm/scrcmd_12.s @@ -669,7 +669,7 @@ _02043266: cmp r7, #0x0 beq _02043270 add r0, r7, #0x0 - bl FreeToHeap + bl Heap_Free _02043270: add sp, #0x38 pop {r3-r7, pc} diff --git a/arm9/asm/unk_02001B80.s b/arm9/asm/unk_02001B80.s index 3239df2a1..206e1eeda 100644 --- a/arm9/asm/unk_02001B80.s +++ b/arm9/asm/unk_02001B80.s @@ -24,7 +24,7 @@ sub_02001B8C: ; 0x02001B8C mov r1, #0x20 add r7, r2, #0x0 str r0, [sp, #0x4] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 add r3, r5, #0x0 ldmia r3!, {r0-r1} @@ -125,7 +125,7 @@ _02001C68: bl DestroyListMenuCursorObj ldrb r0, [r4, #0x1c] add r1, r4, #0x0 - bl FreeToHeapExplicit + bl Heap_FreeExplicit pop {r4, pc} thumb_func_start sub_02001C78 @@ -886,7 +886,7 @@ sub_020021EC: ; 0x020021EC bl RemoveWindow ldr r1, [r5, #0x4] add r0, r4, #0x0 - bl FreeToHeapExplicit + bl Heap_FreeExplicit ldr r0, [r5, #0x0] bl ListMenuItems_Delete add r0, r5, #0x0 diff --git a/arm9/asm/unk_0200E1D0_s.s b/arm9/asm/unk_0200E1D0_s.s index 1c02a5b29..60f8e837a 100644 --- a/arm9/asm/unk_0200E1D0_s.s +++ b/arm9/asm/unk_0200E1D0_s.s @@ -720,7 +720,7 @@ sub_0200E6CC: ; 0x0200E6CC mov r1, #0x10 add r6, r2, #0x0 add r7, r3, #0x0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r1, r0, #0x0 str r5, [r1, #0x0] str r4, [r1, #0x4] @@ -741,7 +741,7 @@ sub_0200E6F8: ; 0x0200E6F8 add r4, r1, #0x0 add r0, r2, #0x0 mov r1, #0x8 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r1, r0, #0x0 mov r2, #0x1 str r5, [r1, #0x0] @@ -766,7 +766,7 @@ sub_0200E71C: ; 0x0200E71C add r0, r5, #0x0 bl SysTask_Destroy add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r3-r5, pc} thumb_func_start sub_0200E73C @@ -780,7 +780,7 @@ sub_0200E73C: ; 0x0200E73C add r0, r5, #0x0 bl SysTask_Destroy add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r3-r5, pc} thumb_func_start sub_0200E758 diff --git a/arm9/asm/unk_0200E850.s b/arm9/asm/unk_0200E850.s index 7d9d45822..00b2c45c7 100644 --- a/arm9/asm/unk_0200E850.s +++ b/arm9/asm/unk_0200E850.s @@ -1542,7 +1542,7 @@ sub_0200F20C: ; 0x0200F20C ldr r0, [r5, #0x20] add r6, r1, #0x0 mov r1, #0x1c - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x14] mov r2, #0x1c mov r1, #0x0 @@ -1643,7 +1643,7 @@ _0200F2C4: str r0, [r5, #0xc] b _0200F2E8 _0200F2D4: - bl FreeToHeap + bl Heap_Free add r0, r4, #0x0 str r0, [r5, #0x14] ldr r0, [r5, #0xc] @@ -2001,7 +2001,7 @@ sub_0200F55C: ; 0x0200F55C _0200F572: ldr r1, _0200F5B8 ; =0x00000604 add r0, r3, #0x0 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x0] mov r0, #0x1 str r0, [r5, #0x4] @@ -2014,7 +2014,7 @@ _0200F572: _0200F58C: ldr r1, _0200F5BC ; =0x00000C08 add r0, r3, #0x0 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x0] mov r0, #0x2 str r0, [r5, #0x4] @@ -2049,7 +2049,7 @@ sub_0200F5C8: ; 0x0200F5C8 push {r4, lr} add r4, r0, #0x0 ldr r0, [r4, #0x0] - bl FreeToHeap + bl Heap_Free mov r0, #0x0 str r0, [r4, #0x0] pop {r4, pc} @@ -3000,7 +3000,7 @@ sub_0200FCC8: ; 0x0200FCC8 ldr r0, [r5, #0x20] add r6, r1, #0x0 mov r1, #0x4c - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x14] add r4, r0, #0x0 ldr r0, [r5, #0x10] @@ -3064,7 +3064,7 @@ _0200FD34: b _0200FD66 _0200FD50: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free add r0, r6, #0x0 str r0, [r5, #0x14] ldr r0, [r5, #0xc] @@ -3088,7 +3088,7 @@ sub_0200FD6C: ; 0x0200FD6C add r6, r1, #0x0 mov r1, #0x98 add r7, r2, #0x0 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x14] add r4, r0, #0x0 ldr r0, [r5, #0x10] @@ -3156,7 +3156,7 @@ _0200FDDC: b _0200FE1A _0200FE04: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free add r0, r6, #0x0 str r0, [r5, #0x14] ldr r0, [r5, #0xc] @@ -3307,7 +3307,7 @@ sub_0200FF18: ; 0x0200FF18 ldr r0, [r5, #0x20] add r4, r1, #0x0 mov r1, #0x38 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x14] ldr r0, [r5, #0x10] add r1, r4, #0x0 @@ -3359,7 +3359,7 @@ _0200FF84: add r0, r4, #0x0 bl sub_0200F5C0 ldr r0, [r5, #0x14] - bl FreeToHeap + bl Heap_Free add r0, r6, #0x0 str r0, [r5, #0x14] ldr r0, [r5, #0xc] @@ -3676,7 +3676,7 @@ sub_020101EC: ; 0x020101EC ldr r0, [r5, #0x20] add r4, r1, #0x0 mov r1, #0x30 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x14] ldr r0, [r5, #0x10] add r1, r4, #0x0 @@ -3728,7 +3728,7 @@ _02010258: add r0, r4, #0x0 bl sub_0200F5C0 ldr r0, [r5, #0x14] - bl FreeToHeap + bl Heap_Free add r0, r6, #0x0 str r0, [r5, #0x14] ldr r0, [r5, #0xc] @@ -3933,7 +3933,7 @@ sub_020103F0: ; 0x020103F0 ldr r0, [r5, #0x20] add r4, r1, #0x0 mov r1, #0x34 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x14] ldr r0, [r5, #0x10] add r1, r4, #0x0 @@ -3985,7 +3985,7 @@ _0201045C: add r0, r4, #0x0 bl sub_0200F5C0 ldr r0, [r5, #0x14] - bl FreeToHeap + bl Heap_Free add r0, r6, #0x0 str r0, [r5, #0x14] ldr r0, [r5, #0xc] @@ -4260,7 +4260,7 @@ sub_02010688: ; 0x02010688 ldr r0, [r5, #0x20] add r4, r1, #0x0 mov r1, #0x30 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x14] ldr r0, [r5, #0x10] add r1, r4, #0x0 @@ -4314,7 +4314,7 @@ _020106F4: add r0, r4, #0x0 bl sub_0200F5C0 ldr r0, [r5, #0x14] - bl FreeToHeap + bl Heap_Free add r0, r6, #0x0 str r0, [r5, #0x14] ldr r0, [r5, #0xc] @@ -4346,7 +4346,7 @@ sub_02010720: ; 0x02010720 mul r1, r2 str r3, [sp, #0x1c] str r0, [sp, #0x44] - bl AllocFromHeap + bl Heap_Alloc str r0, [r7, #0xc] cmp r0, #0x0 bne _02010748 @@ -4507,7 +4507,7 @@ sub_02010884: ; 0x02010884 push {r4, lr} add r4, r0, #0x0 ldr r0, [r4, #0xc] - bl FreeToHeap + bl Heap_Free mov r0, #0x0 str r0, [r4, #0xc] pop {r4, pc} @@ -4620,7 +4620,7 @@ sub_02010948: ; 0x02010948 ldr r0, [r5, #0x20] add r4, r1, #0x0 mov r1, #0x38 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x14] mov r1, #0x0 mov r2, #0x38 @@ -4677,7 +4677,7 @@ _020109BC: add r0, r4, #0x0 bl sub_0200F5C0 ldr r0, [r5, #0x14] - bl FreeToHeap + bl Heap_Free add r0, r6, #0x0 str r0, [r5, #0x14] ldr r0, [r5, #0xc] @@ -5033,7 +5033,7 @@ sub_02010C7C: ; 0x02010C7C ldr r0, [r5, #0x20] add r4, r1, #0x0 mov r1, #0x38 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x14] mov r1, #0x0 mov r2, #0x38 @@ -5090,7 +5090,7 @@ _02010CF0: add r0, r4, #0x0 bl sub_0200F5C0 ldr r0, [r5, #0x14] - bl FreeToHeap + bl Heap_Free add r0, r6, #0x0 str r0, [r5, #0x14] ldr r0, [r5, #0xc] @@ -5377,7 +5377,7 @@ sub_02010F2C: ; 0x02010F2C mov r1, #0xcd ldr r0, [r5, #0x20] lsl r1, r1, #0x2 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0xcd str r0, [r5, #0x14] mov r1, #0x0 @@ -5436,7 +5436,7 @@ _02010FAA: add r0, r4, #0x0 bl sub_0201111C ldr r0, [r5, #0x14] - bl FreeToHeap + bl Heap_Free add r0, r6, #0x0 str r0, [r5, #0x14] ldr r0, [r5, #0xc] @@ -5716,7 +5716,7 @@ sub_020111AC: ; 0x020111AC mov r1, #0xe2 ldr r0, [r5, #0x20] lsl r1, r1, #0x2 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0xe2 mov r1, #0x0 lsl r2, r2, #0x2 @@ -5797,7 +5797,7 @@ _02011242: str r0, [r5, #0xc] b _02011272 _02011258: - bl FreeToHeap + bl Heap_Free add r0, r4, #0x0 str r0, [r5, #0x14] ldr r0, [r5, #0xc] diff --git a/arm9/asm/unk_02011744.s b/arm9/asm/unk_02011744.s index 637d45517..c765b9a16 100644 --- a/arm9/asm/unk_02011744.s +++ b/arm9/asm/unk_02011744.s @@ -30,7 +30,7 @@ sub_02011744: ; 0x02011744 str r0, [sp, #0x4] add r0, r7, #0x0 mov r1, #0x68 - bl AllocFromHeap + bl Heap_Alloc str r0, [sp, #0x8] cmp r0, #0x0 bne _0201175E @@ -63,7 +63,7 @@ _0201177E: mul r4, r1 add r0, r7, #0x0 add r1, r4, #0x0 - bl AllocFromHeap + bl Heap_Alloc ldr r1, [sp, #0x8] cmp r0, #0x0 str r0, [r1, #0x60] @@ -93,15 +93,15 @@ _020117C6: add r5, r6, #0x0 _020117CA: ldr r0, [r5, #0x0] - bl FreeToHeap + bl Heap_Free add r4, r4, #0x1 add r5, r5, #0x4 cmp r4, #0xc blt _020117CA ldr r0, [r6, #0x60] - bl FreeToHeap + bl Heap_Free add r0, r6, #0x0 - bl FreeToHeap + bl Heap_Free pop {r4-r6, pc} .balign 4 @@ -137,12 +137,12 @@ _02011802: mov r1, #0x24 ldr r0, [r5, #0x2c] mul r1, r6 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r7, r0, #0x0 mov r1, #0xc ldr r0, [r5, #0x2c] mul r1, r6 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #0x0] str r6, [r4, #0x4] ldr r0, [r5, #0x28] @@ -160,7 +160,7 @@ _02011802: add r3, r4, #0x0 bl sub_02011EAC add r0, r7, #0x0 - bl FreeToHeap + bl Heap_Free add r0, sp, #0x8 bl sub_02011FDC add r0, r4, #0x0 @@ -183,7 +183,7 @@ _02011884: add r0, r4, #0x0 bl sub_02011F00 ldr r0, [r4, #0x0] - bl FreeToHeap + bl Heap_Free add r0, r4, #0x0 bl sub_02011B90 pop {r4, pc} @@ -920,7 +920,7 @@ _02011DC6: lsl r4, r4, #0x5 ldr r0, [sp, #0x34] add r1, r4, #0x0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r7, r0, #0x0 ldr r0, [r6, #0x4] ldr r1, [sp, #0x10] @@ -971,7 +971,7 @@ _02011E1A: ldr r0, [sp, #0x28] str r0, [r5, #0x20] add r0, r7, #0x0 - bl FreeToHeap + bl Heap_Free ldr r0, [sp, #0x2c] add r0, r0, r4 add sp, #0x14 @@ -1171,7 +1171,7 @@ _02011F80: sub_02011FAC: ; 0x02011FAC push {r4, lr} mov r1, #0x14 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0x0 bne _02011FBC bl GF_AssertFail @@ -1191,7 +1191,7 @@ sub_02011FC8: ; 0x02011FC8 bl GF_AssertFail _02011FD2: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .balign 4 diff --git a/arm9/asm/unk_02012004.s b/arm9/asm/unk_02012004.s index e89151f04..7ed8f1cba 100644 --- a/arm9/asm/unk_02012004.s +++ b/arm9/asm/unk_02012004.s @@ -93,7 +93,7 @@ _02012066: bl GF_AssertFail _0201206E: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r4-r6, pc} .balign 4 @@ -266,7 +266,7 @@ sub_0201219C: ; 0x0201219C add r0, r5, #0x0 lsl r1, r1, #0x5 str r3, [sp, #0x20] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 ldr r0, [sp, #0x38] ldr r3, [sp, #0x20] @@ -394,7 +394,7 @@ _0201229C: blt _02012270 _020122AE: ldr r0, [sp, #0x20] - bl FreeToHeap + bl Heap_Free add sp, #0x30 pop {r3-r7, pc} @@ -411,7 +411,7 @@ sub_020122B8: ; 0x020122B8 add r0, r5, #0x0 lsl r1, r1, #0x5 str r3, [sp, #0x10] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 ldr r0, [sp, #0x28] ldr r3, [sp, #0x10] @@ -566,7 +566,7 @@ _020123D4: cmp r4, #0x6 blt _020123D4 ldr r0, [sp, #0x14] - bl FreeToHeap + bl Heap_Free add sp, #0x7c pop {r4-r7, pc} nop @@ -623,7 +623,7 @@ sub_0201244C: ; 0x0201244C add r5, r0, #0x0 add r0, r7, #0x0 lsl r1, r1, #0x6 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 add r0, r5, #0x0 add r1, r6, #0x0 @@ -641,7 +641,7 @@ sub_02012470: ; 0x02012470 add r6, r1, #0x0 add r0, r7, #0x0 mov r1, #0x20 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 add r0, r5, #0x0 add r1, r6, #0x0 @@ -660,7 +660,7 @@ _0201249C: mov r2, #0x20 bl MIi_CpuCopy16 add r0, r5, #0x0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0x0 pop {r3-r7, pc} .balign 4 @@ -722,7 +722,7 @@ _02012504: cmp r4, #0x6 blt _02012504 ldr r0, [sp, #0x24] - bl FreeToHeap + bl Heap_Free add sp, #0x8c pop {r4-r7, pc} nop diff --git a/arm9/asm/unk_02012944.s b/arm9/asm/unk_02012944.s index ef34065fd..baa844e77 100644 --- a/arm9/asm/unk_02012944.s +++ b/arm9/asm/unk_02012944.s @@ -9,7 +9,7 @@ sub_02012944: ; 0x02012944 add r5, r1, #0x0 mov r1, #0xc add r4, r2, #0x0 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x0 strb r1, [r0, #0x0] strb r1, [r0, #0x1] @@ -37,7 +37,7 @@ sub_02012974: ; 0x02012974 bl GF_AssertFail _0201297E: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .balign 4 @@ -119,7 +119,7 @@ sub_02012A00: ; 0x02012A00 push {r3-r5, lr} ldr r1, _02012A2C ; =0x0000079C add r5, r0, #0x0 - bl AllocFromHeap + bl Heap_Alloc ldr r2, _02012A2C ; =0x0000079C mov r1, #0x0 add r4, r0, #0x0 @@ -247,7 +247,7 @@ sub_02012B00: ; 0x02012B00 ldr r0, [r4, r0] bl sub_02012974 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .balign 4 diff --git a/arm9/asm/unk_02012CC8.s b/arm9/asm/unk_02012CC8.s index 84c021288..912624afb 100644 --- a/arm9/asm/unk_02012CC8.s +++ b/arm9/asm/unk_02012CC8.s @@ -93,7 +93,7 @@ _02012CFA: _02012D04: ldr r0, [sp, #0x2c] mov r1, #0xdc - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 bne _02012D14 bl GF_AssertFail @@ -267,7 +267,7 @@ _02012E60: ldr r0, [r5, #0x4] cmp r0, #0x0 beq _02012E78 - bl FreeToHeap + bl Heap_Free mov r0, #0x0 str r0, [r5, #0x4] _02012E78: @@ -294,7 +294,7 @@ _02012E94: bl Camera_Delete _02012E9E: add r0, r5, #0x0 - bl FreeToHeap + bl Heap_Free pop {r3-r7, pc} nop _02012EA8: .word UNK_021C4858 @@ -1493,7 +1493,7 @@ ListMenuCursorNew: ; 0x02013690 push {r3-r5, lr} mov r1, #0x8 add r5, r0, #0x0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 beq _020136B2 ldr r0, _020136B8 ; =0x0001020F @@ -1526,7 +1526,7 @@ _020136CA: bl String_Delete _020136D8: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free _020136DE: pop {r4, pc} diff --git a/arm9/asm/unk_02013CD4.s b/arm9/asm/unk_02013CD4.s index 11e02176a..41eec6cba 100644 --- a/arm9/asm/unk_02013CD4.s +++ b/arm9/asm/unk_02013CD4.s @@ -15,7 +15,7 @@ sub_02013CD4: ; 0x02013CD4 add r5, r0, #0x0 ldr r0, [r5, #0xc] mov r1, #0x18 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 bne _02013CE8 bl GF_AssertFail @@ -65,13 +65,13 @@ _02013D36: bl GF_AssertFail _02013D40: ldr r0, [r4, #0x0] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x8] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x10] - bl FreeToHeap + bl Heap_Free add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .balign 4 @@ -423,7 +423,7 @@ sub_02013F68: ; 0x02013F68 add r6, r0, #0x0 add r0, r1, #0x0 lsl r1, r6, #0x6 - bl AllocFromHeap + bl Heap_Alloc add r7, r0, #0x0 bne _02013F7C bl GF_AssertFail @@ -451,7 +451,7 @@ sub_02013F98: ; 0x02013F98 add r0, r1, #0x0 mov r1, #0x28 mul r1, r6 - bl AllocFromHeap + bl Heap_Alloc add r7, r0, #0x0 bne _02013FAE bl GF_AssertFail @@ -478,7 +478,7 @@ sub_02013FC8: ; 0x02013FC8 add r0, r1, #0x0 mov r1, #0x18 mul r1, r6 - bl AllocFromHeap + bl Heap_Alloc add r7, r0, #0x0 bne _02013FDE bl GF_AssertFail diff --git a/arm9/asm/unk_020144FC.s b/arm9/asm/unk_020144FC.s index 1d3b2f4ca..4c5f04339 100644 --- a/arm9/asm/unk_020144FC.s +++ b/arm9/asm/unk_020144FC.s @@ -24,7 +24,7 @@ sub_02014518: ; 0x02014518 push {r3-r7, lr} mov r1, #0x78 add r7, r0, #0x0 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x0 mov r2, #0x78 add r6, r0, #0x0 @@ -71,7 +71,7 @@ _0201456E: ldr r0, [r6, #0x0] bl DestroyMsgData add r0, r6, #0x0 - bl FreeToHeap + bl Heap_Free pop {r4-r6, pc} thumb_func_start sub_02014588 diff --git a/arm9/asm/unk_02014590.s b/arm9/asm/unk_02014590.s index 5c51882f9..0c41cac62 100644 --- a/arm9/asm/unk_02014590.s +++ b/arm9/asm/unk_02014590.s @@ -8,7 +8,7 @@ sub_02014590: ; 0x02014590 push {r3-r5, lr} add r5, r0, #0x0 mov r1, #0x9c - bl AllocFromHeap + bl Heap_Alloc add r1, r5, #0x0 add r4, r0, #0x0 bl sub_020146F0 @@ -30,7 +30,7 @@ sub_020145A8: ; 0x020145A8 bl sub_020146C4 _020145BE: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .balign 4 @@ -567,7 +567,7 @@ sub_02014970: ; 0x02014970 add r5, r6, #0x0 _020149B4: ldr r0, [r5, #0x8] - bl FreeToHeap + bl Heap_Free add r4, r4, #0x1 add r5, r5, #0x4 cmp r4, #0x4 @@ -656,7 +656,7 @@ sub_02014A3C: ; 0x02014A3C mov r1, #0x14 add r5, r2, #0x0 add r6, r3, #0x0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 add r2, r4, #0x0 mov r1, #0x14 @@ -696,7 +696,7 @@ sub_02014A8C: ; 0x02014A8C mov r1, #0x14 add r5, r2, #0x0 add r6, r3, #0x0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 add r2, r4, #0x0 mov r1, #0x14 @@ -746,9 +746,9 @@ sub_02014AD4: ; 0x02014AD4 add r0, r5, #0x0 bl SysTask_Destroy ldr r0, [r4, #0x8] - bl FreeToHeap + bl Heap_Free add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r3-r5, pc} .balign 4 @@ -782,9 +782,9 @@ _02014B44: add r0, r5, #0x0 bl SysTask_Destroy ldr r0, [r4, #0x4] - bl FreeToHeap + bl Heap_Free add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r3-r5, pc} thumb_func_start sub_02014B58 diff --git a/arm9/asm/unk_02014BF4.s b/arm9/asm/unk_02014BF4.s index 23e6c5b4d..caf57dcfb 100644 --- a/arm9/asm/unk_02014BF4.s +++ b/arm9/asm/unk_02014BF4.s @@ -80,7 +80,7 @@ sub_02014BF4: ; 0x02014BF4 mov r1, #0xc add r5, r0, #0x0 add r6, r2, #0x0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 strb r6, [r4, #0x8] mov r0, #0x1d @@ -91,7 +91,7 @@ sub_02014BF4: ; 0x02014BF4 add r0, r5, #0x0 add r1, r6, #0x0 str r5, [r4, #0x4] - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x0 add r2, r6, #0x0 str r0, [r4, #0x0] @@ -104,9 +104,9 @@ sub_02014C28: ; 0x02014C28 push {r4, lr} add r4, r0, #0x0 ldr r0, [r4, #0x0] - bl FreeToHeap + bl Heap_Free add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .balign 4 @@ -319,7 +319,7 @@ sub_02014D9C: ; 0x02014D9C ldr r0, [r5, #0x0] add r0, r0, r4 ldr r0, [r0, #0x8] - bl FreeToHeap + bl Heap_Free _02014DD6: pop {r3-r5, pc} @@ -350,7 +350,7 @@ _02014DF0: mov r0, #0x0 str r0, [r4, #0x4] ldr r0, [r4, #0x8] - bl FreeToHeap + bl Heap_Free _02014E0E: pop {r3-r5, pc} diff --git a/arm9/asm/unk_0201C24C.s b/arm9/asm/unk_0201C24C.s index 91db2a773..4c45e5e3a 100644 --- a/arm9/asm/unk_0201C24C.s +++ b/arm9/asm/unk_0201C24C.s @@ -22,7 +22,7 @@ sub_0201C24C: ; 0x0201C24C _0201C25E: add r0, r4, #0x0 mov r1, #0xc - bl AllocFromHeap + bl Heap_Alloc ldr r1, _0201C298 ; =UNK_021C5934 cmp r0, #0x0 str r0, [r1, #0x0] @@ -31,7 +31,7 @@ _0201C25E: _0201C272: add r0, r4, #0x0 lsl r1, r5, #0x4 - bl AllocFromHeap + bl Heap_Alloc ldr r1, _0201C298 ; =UNK_021C5934 ldr r2, [r1, #0x0] str r0, [r2, #0x8] @@ -60,10 +60,10 @@ _0201C2AA: ldr r0, _0201C2C4 ; =UNK_021C5934 ldr r0, [r0, #0x0] ldr r0, [r0, #0x8] - bl FreeToHeap + bl Heap_Free ldr r0, _0201C2C4 ; =UNK_021C5934 ldr r0, [r0, #0x0] - bl FreeToHeap + bl Heap_Free ldr r0, _0201C2C4 ; =UNK_021C5934 mov r1, #0x0 str r1, [r0, #0x0] @@ -131,7 +131,7 @@ sub_0201C328: ; 0x0201C328 add r0, r1, #0x0 mov r1, #0x30 mul r1, r4 - bl AllocFromHeap + bl Heap_Alloc ldr r2, _0201C344 ; =sub_0201C358 add r1, r4, #0x0 add r5, r0, #0x0 @@ -150,10 +150,10 @@ _0201C34C: .word NNS_G2dUpdateCellTransferStateManager thumb_func_start sub_0201C350 sub_0201C350: ; 0x0201C350 - ldr r3, _0201C354 ; =FreeToHeap + ldr r3, _0201C354 ; =Heap_Free bx r3 .balign 4 -_0201C354: .word FreeToHeap +_0201C354: .word Heap_Free thumb_func_start sub_0201C358 sub_0201C358: ; 0x0201C358 diff --git a/arm9/asm/unk_0201C360.s b/arm9/asm/unk_0201C360.s index 32ea444e0..a771543a4 100644 --- a/arm9/asm/unk_0201C360.s +++ b/arm9/asm/unk_0201C360.s @@ -10,12 +10,12 @@ sub_0201C360: ; 0x0201C360 add r5, r0, #0x0 add r0, r6, #0x0 mov r1, #0x8 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x14 add r4, r0, #0x0 add r0, r6, #0x0 mul r1, r5 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #0x0] mov r6, #0x0 str r5, [r4, #0x4] @@ -41,9 +41,9 @@ sub_0201C39C: ; 0x0201C39C add r4, r0, #0x0 bl sub_0201C414 ldr r0, [r4, #0x0] - bl FreeToHeap + bl Heap_Free add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .balign 4 diff --git a/arm9/asm/unk_0201D040.s b/arm9/asm/unk_0201D040.s index c9bd87302..8b78db1e8 100644 --- a/arm9/asm/unk_0201D040.s +++ b/arm9/asm/unk_0201D040.s @@ -38,7 +38,7 @@ sub_0201D060: ; 0x0201D060 bne _0201D11A ldr r0, [r5, #0xc] mov r1, #0x3c - bl AllocFromHeap + bl Heap_Alloc add r1, r0, #0x0 ldr r0, _0201D120 ; =UNK_021C5994 mov r2, #0x3c @@ -54,7 +54,7 @@ sub_0201D060: ; 0x0201D060 ldr r2, [r1, #0x4] mov r1, #0x54 mul r1, r2 - bl AllocFromHeap + bl Heap_Alloc ldr r7, _0201D120 ; =UNK_021C5994 mov r6, #0x0 ldr r1, [r7, #0x0] @@ -138,10 +138,10 @@ sub_0201D12C: ; 0x0201D12C ldr r0, _0201D164 ; =UNK_021C5994 ldr r0, [r0, #0x0] ldr r0, [r0, #0x0] - bl FreeToHeap + bl Heap_Free ldr r0, _0201D164 ; =UNK_021C5994 ldr r0, [r0, #0x0] - bl FreeToHeap + bl Heap_Free ldr r0, _0201D164 ; =UNK_021C5994 mov r1, #0x0 str r1, [r0, #0x0] @@ -1664,14 +1664,14 @@ sub_0201DC58: ; 0x0201DC58 ldr r0, [r0, #0x34] cmp r0, #0x0 beq _0201DC76 - bl FreeToHeap + bl Heap_Free _0201DC76: ldr r0, _0201DCBC ; =UNK_021C5994 ldr r0, [r0, #0x0] ldr r0, [r0, #0x38] cmp r0, #0x0 beq _0201DC84 - bl FreeToHeap + bl Heap_Free _0201DC84: ldr r0, _0201DCBC ; =UNK_021C5994 ldr r0, [r0, #0x0] @@ -1680,7 +1680,7 @@ _0201DC84: beq _0201DC9C add r0, r6, #0x0 lsr r1, r5, #0x3 - bl AllocFromHeap + bl Heap_Alloc ldr r1, _0201DCBC ; =UNK_021C5994 ldr r1, [r1, #0x0] str r0, [r1, #0x34] @@ -1692,7 +1692,7 @@ _0201DC9C: beq _0201DCB4 add r0, r6, #0x0 lsr r1, r4, #0x3 - bl AllocFromHeap + bl Heap_Alloc ldr r1, _0201DCBC ; =UNK_021C5994 ldr r1, [r1, #0x0] str r0, [r1, #0x38] @@ -1714,12 +1714,12 @@ sub_0201DCC0: ; 0x0201DCC0 bne _0201DCDA mov r1, #0x0 str r1, [r2, #0x24] - bl FreeToHeap + bl Heap_Free pop {r3, pc} _0201DCDA: mov r1, #0x0 str r1, [r2, #0x28] - bl FreeToHeap + bl Heap_Free _0201DCE2: pop {r3, pc} .balign 4 diff --git a/arm9/asm/unk_0201E00C.s b/arm9/asm/unk_0201E00C.s index a8a15365b..a49f5592c 100644 --- a/arm9/asm/unk_0201E00C.s +++ b/arm9/asm/unk_0201E00C.s @@ -20,7 +20,7 @@ sub_0201E00C: ; 0x0201E00C bne _0201E060 add r0, r4, #0x0 mov r1, #0x28 - bl AllocFromHeap + bl Heap_Alloc add r1, r0, #0x0 ldr r0, _0201E064 ; =UNK_021C5998 mov r2, #0x28 @@ -33,7 +33,7 @@ sub_0201E00C: ; 0x0201E00C mul r1, r6 str r6, [r0, #0x4] add r0, r4, #0x0 - bl AllocFromHeap + bl Heap_Alloc ldr r7, _0201E064 ; =UNK_021C5998 mov r4, #0x0 ldr r1, [r7, #0x0] @@ -89,10 +89,10 @@ sub_0201E08C: ; 0x0201E08C ldr r0, _0201E0B4 ; =UNK_021C5998 ldr r0, [r0, #0x0] ldr r0, [r0, #0x0] - bl FreeToHeap + bl Heap_Free ldr r0, _0201E0B4 ; =UNK_021C5998 ldr r0, [r0, #0x0] - bl FreeToHeap + bl Heap_Free ldr r0, _0201E0B4 ; =UNK_021C5998 mov r1, #0x0 str r1, [r0, #0x0] diff --git a/arm9/asm/unk_0201F06C.s b/arm9/asm/unk_0201F06C.s index 288d4958e..d27baa199 100644 --- a/arm9/asm/unk_0201F06C.s +++ b/arm9/asm/unk_0201F06C.s @@ -126,7 +126,7 @@ _0201F112: mov r1, #0xd4 add r0, r4, #0x0 mul r1, r6 - bl AllocFromHeap + bl Heap_Alloc ldr r7, _0201F13C ; =UNK_021C59A8 mov r4, #0x0 str r0, [r7, #0x0] @@ -168,7 +168,7 @@ _0201F14E: _0201F160: ldr r0, _0201F174 ; =UNK_021C59A8 ldr r0, [r0, #0x0] - bl FreeToHeap + bl Heap_Free ldr r0, _0201F174 ; =UNK_021C59A8 mov r1, #0x0 str r1, [r0, #0x0] @@ -230,7 +230,7 @@ _0201F1C8: mov r1, #0xb8 ldr r0, [r5, #0x4] mul r1, r2 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #0x4] ldr r0, [r5, #0x0] str r0, [r4, #0x8] @@ -248,7 +248,7 @@ _0201F1C8: ldr r1, [r5, #0x0] ldr r0, [r5, #0x4] lsl r1, r1, #0x2 - bl AllocFromHeap + bl Heap_Alloc add r1, r4, #0x0 add r1, #0xc4 str r0, [r1, #0x0] @@ -256,7 +256,7 @@ _0201F1C8: bl sub_0201FABC ldr r0, [r5, #0x4] mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc add r1, r4, #0x0 add r1, #0xcc str r0, [r1, #0x0] @@ -265,7 +265,7 @@ _0201F1C8: ldr r0, [r0, #0x0] ldr r1, [r5, #0x4] mov r2, #0x4 - bl GF_ExpHeap_FndInitAllocator + bl HeapExp_FndInitAllocator ldr r0, [r5, #0x0] ldr r1, [r5, #0x4] bl sub_0201C360 @@ -289,15 +289,15 @@ _0201F24A: beq _0201F27E bl sub_0201F284 ldr r0, [r4, #0x4] - bl FreeToHeap + bl Heap_Free add r0, r4, #0x0 add r0, #0xc4 ldr r0, [r0, #0x0] - bl FreeToHeap + bl Heap_Free add r0, r4, #0x0 add r0, #0xcc ldr r0, [r0, #0x0] - bl FreeToHeap + bl Heap_Free add r0, r4, #0x0 add r0, #0xd0 ldr r0, [r0, #0x0] @@ -1775,7 +1775,7 @@ _0201FCC4: mov r1, #0x49 ldr r0, [r5, #0x8] lsl r1, r1, #0x2 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 bne _0201FCD6 bl GF_AssertFail @@ -1787,7 +1787,7 @@ _0201FCD6: lsl r1, r2, #0x6 add r1, r2, r1 lsl r1, r1, #0x2 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #0x0] cmp r0, #0x0 bne _0201FCF4 @@ -1798,7 +1798,7 @@ _0201FCF4: ldr r1, [r5, #0x0] ldr r0, [r5, #0x8] lsl r1, r1, #0x2 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #0x8] cmp r0, #0x0 bne _0201FD0C @@ -1856,15 +1856,15 @@ _0201FD6C: mov r0, #0x46 lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x8] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x0] - bl FreeToHeap + bl Heap_Free add r0, r4, #0x0 bl sub_0201FE44 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x1 pop {r4, pc} .balign 4 @@ -2211,12 +2211,12 @@ _0202000E: ldr r0, [r4, #0x70] cmp r0, #0x0 beq _02020026 - bl FreeToHeap + bl Heap_Free _02020026: ldr r0, [r4, #0x74] cmp r0, #0x0 beq _02020030 - bl FreeToHeap + bl Heap_Free _02020030: add r0, r5, #0x0 mov r1, #0x0 @@ -2792,7 +2792,7 @@ sub_020203CC: ; 0x020203CC push {r4, lr} mov r1, #0x1 lsl r1, r1, #0xa - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 mov r0, #0xb mov r2, #0x1 @@ -2810,7 +2810,7 @@ sub_020203CC: ; 0x020203CC lsl r2, r2, #0xa bl GX_LoadOAM add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_start sub_02020404 @@ -2818,7 +2818,7 @@ sub_02020404: ; 0x02020404 push {r4, lr} mov r1, #0x1 lsl r1, r1, #0xa - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 mov r0, #0xb mov r2, #0x1 @@ -2832,7 +2832,7 @@ sub_02020404: ; 0x02020404 lsl r2, r2, #0xa bl GXS_LoadOAM add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .balign 4 @@ -3040,12 +3040,12 @@ sub_02020588: ; 0x02020588 mov r1, #0x28 add r0, r7, #0x0 mul r1, r6 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x54 str r0, [r4, #0x70] add r0, r7, #0x0 mul r1, r6 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #0x74] ldr r0, [r4, #0x4] add r3, r6, #0x0 diff --git a/arm9/asm/unk_02020C44.s b/arm9/asm/unk_02020C44.s index a0a867817..a6ff8d784 100644 --- a/arm9/asm/unk_02020C44.s +++ b/arm9/asm/unk_02020C44.s @@ -15,14 +15,14 @@ sub_02020C44: ; 0x02020C44 add r7, r0, #0x0 add r0, r4, #0x0 mov r1, #0xc - bl AllocFromHeap + bl Heap_Alloc add r6, r0, #0x0 bne _02020C5A bl GF_AssertFail _02020C5A: add r0, r4, #0x0 lsl r1, r7, #0x3 - bl AllocFromHeap + bl Heap_Alloc str r0, [r6, #0x0] cmp r0, #0x0 bne _02020C6C @@ -58,9 +58,9 @@ _02020C9A: add r0, r4, #0x0 bl sub_02020D9C ldr r0, [r4, #0x0] - bl FreeToHeap + bl Heap_Free add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .balign 4 @@ -176,7 +176,7 @@ _02020D7E: ldr r0, [r4, #0x4] cmp r0, #0x0 beq _02020D8C - bl FreeToHeap + bl Heap_Free mov r0, #0x0 str r0, [r4, #0x4] _02020D8C: @@ -279,7 +279,7 @@ _02020E2A: ldr r0, [r5, #0x4] cmp r0, #0x0 beq _02020E34 - bl FreeToHeap + bl Heap_Free _02020E34: str r4, [r5, #0x4] pop {r3-r5, pc} @@ -347,7 +347,7 @@ sub_02020E90: ; 0x02020E90 add r6, r0, #0x0 add r0, r4, #0x0 mov r1, #0x8 - bl AllocFromHeap + bl Heap_Alloc add r7, r0, #0x0 add r0, r6, #0x0 add r1, r4, #0x0 @@ -356,7 +356,7 @@ sub_02020E90: ; 0x02020E90 str r0, [r7, #0x0] add r0, r4, #0x0 mul r1, r6 - bl AllocFromHeap + bl Heap_Alloc mov r4, #0x0 str r0, [r7, #0x4] cmp r6, #0x0 @@ -387,9 +387,9 @@ _02020EDE: ldr r0, [r4, #0x0] bl sub_02020C90 ldr r0, [r4, #0x4] - bl FreeToHeap + bl Heap_Free add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_start sub_02020EF8 @@ -475,7 +475,7 @@ _02020F82: cmp r0, #0x0 bne _02020F98 ldr r0, [r4, #0x10] - bl FreeToHeap + bl Heap_Free mov r0, #0x0 strh r0, [r4, #0x16] _02020F98: @@ -710,7 +710,7 @@ _0202112E: ldr r3, [r4, #0xc] bl sub_020212E4 ldr r0, [r4, #0x10] - bl FreeToHeap + bl Heap_Free mov r0, #0x0 str r0, [r4, #0x10] mov r0, #0x1 @@ -973,7 +973,7 @@ sub_02021310: ; 0x02021310 add r5, r0, #0x0 add r0, r4, #0x0 add r1, r5, #0x0 - bl AllocFromHeap + bl Heap_Alloc add r1, r6, #0x0 add r2, r5, #0x0 add r4, r0, #0x0 diff --git a/arm9/asm/unk_02022318.s b/arm9/asm/unk_02022318.s index 098f068ac..a48df5987 100644 --- a/arm9/asm/unk_02022318.s +++ b/arm9/asm/unk_02022318.s @@ -12,7 +12,7 @@ sub_02022318: ; 0x02022318 add r6, r0, #0x0 add r5, r2, #0x0 str r3, [sp, #0x4] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 str r6, [r4, #0x0] bl NNS_G3dInit @@ -27,7 +27,7 @@ sub_02022318: ; 0x02022318 add r6, r0, #0x0 ldr r0, [r4, #0x0] add r1, r6, #0x0 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #0x8] mov r0, #0x1 str r0, [sp, #0x0] @@ -52,7 +52,7 @@ _0202236E: add r5, r0, #0x0 ldr r0, [r4, #0x0] add r1, r5, #0x0 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #0x4] ldr r0, [sp, #0x20] ldr r1, [r4, #0x4] @@ -87,11 +87,11 @@ sub_020223BC: ; 0x020223BC push {r4, lr} add r4, r0, #0x0 ldr r0, [r4, #0x4] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x8] - bl FreeToHeap + bl Heap_Free add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_start sub_020223D4 diff --git a/arm9/asm/unk_020250A4.s b/arm9/asm/unk_020250A4.s index 5fc1d6c2c..1fd37311f 100644 --- a/arm9/asm/unk_020250A4.s +++ b/arm9/asm/unk_020250A4.s @@ -68,7 +68,7 @@ _02025112: cmp r4, r0 blt _020250DC ldr r0, [sp, #0x8] - bl FreeToHeap + bl Heap_Free add sp, #0xc pop {r4-r7, pc} .balign 4 @@ -82,7 +82,7 @@ sub_02025128: ; 0x02025128 str r0, [sp, #0x0] add r0, r7, #0x0 mov r1, #0xc0 - bl AllocFromHeap + bl Heap_Alloc str r0, [sp, #0x4] mov r6, #0x0 add r5, r0, #0x0 @@ -104,7 +104,7 @@ _02025142: bl GetNutAttr strb r0, [r5, #0x2] add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free add r6, r6, #0x1 add r5, r5, #0x3 cmp r6, #0x40 diff --git a/arm9/asm/unk_02025954.s b/arm9/asm/unk_02025954.s index 0a5d2d8c1..9a874c9e6 100644 --- a/arm9/asm/unk_02025954.s +++ b/arm9/asm/unk_02025954.s @@ -44,7 +44,7 @@ sub_02025960: ; 0x02025960 sub_02025964: ; 0x02025964 push {r4, lr} mov r1, #0x3c - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x0 mov r2, #0x3c add r4, r0, #0x0 diff --git a/arm9/asm/unk_02026CD0.s b/arm9/asm/unk_02026CD0.s index f515ee5a1..9f61c1223 100644 --- a/arm9/asm/unk_02026CD0.s +++ b/arm9/asm/unk_02026CD0.s @@ -440,7 +440,7 @@ sub_02026FE4: ; 0x02026FE4 sub_02026FE8: ; 0x02026FE8 push {r4, lr} mov r1, #0x98 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x0 mov r2, #0x98 add r4, r0, #0x0 diff --git a/arm9/asm/unk_02027E30.s b/arm9/asm/unk_02027E30.s index d55749da9..8d17ca4a5 100644 --- a/arm9/asm/unk_02027E30.s +++ b/arm9/asm/unk_02027E30.s @@ -39,7 +39,7 @@ sub_02027E44: ; 0x02027E44 Poffin_New: ; 0x02027E5C push {r4, lr} mov r1, #0x8 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0x0 bl sub_02027E44 add r0, r4, #0x0 diff --git a/arm9/asm/unk_02028980.s b/arm9/asm/unk_02028980.s index fdd46519f..783c8860a 100644 --- a/arm9/asm/unk_02028980.s +++ b/arm9/asm/unk_02028980.s @@ -267,7 +267,7 @@ _02028B0E: bl sub_02028C08 _02028B12: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .balign 4 @@ -939,7 +939,7 @@ sub_02028FA4: ; 0x02028FA4 add r5, r0, #0x0 add r0, r1, #0x0 mov r1, #0x4 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 add r0, sp, #0x0 bl GF_RTC_CopyDate @@ -990,7 +990,7 @@ _02029010: .word 0xFFFFC7FF sub_02029014: ; 0x02029014 push {r3, lr} mov r1, #0x8 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x0 strb r1, [r0, #0x0] strb r1, [r0, #0x1] @@ -1212,7 +1212,7 @@ sub_0202916C: ; 0x0202916C sub_02029178: ; 0x02029178 push {r3, lr} mov r1, #0x4 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x0 strb r1, [r0, #0x0] strb r1, [r0, #0x1] @@ -1365,7 +1365,7 @@ sub_0202928C: ; 0x0202928C add r4, r1, #0x0 add r0, r2, #0x0 mov r1, #0x4 - bl AllocFromHeap + bl Heap_Alloc ldrh r2, [r0, #0x0] mov r1, #0x1 bic r2, r1 @@ -1388,7 +1388,7 @@ _020292B8: .word 0xFFFF0001 sub_020292BC: ; 0x020292BC push {r4, lr} mov r1, #0x3a - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x0 mov r2, #0x3a add r4, r0, #0x0 diff --git a/arm9/asm/unk_0202B870.s b/arm9/asm/unk_0202B870.s index c297fb66d..026465055 100644 --- a/arm9/asm/unk_0202B870.s +++ b/arm9/asm/unk_0202B870.s @@ -158,7 +158,7 @@ sub_0202B93C: ; 0x0202B93C add r4, r0, #0x0 add r0, r5, #0x0 mov r1, #0x34 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd str r0, [sp, #0x4] add r5, r0, #0x0 ldr r0, _0202B9E8 ; =UNK_020EEAD0 @@ -248,7 +248,7 @@ sub_0202B9EC: ; 0x0202B9EC add r6, r0, #0x0 add r0, r4, #0x0 lsl r1, r1, #0x2 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r2, #0x4e mov r1, #0x0 lsl r2, r2, #0x2 @@ -286,7 +286,7 @@ _0202BA38: cmp r6, #0xd blt _0202BA38 ldr r0, [sp, #0x0] - bl FreeToHeap + bl Heap_Free add r0, r7, #0x0 bl String_Delete ldr r0, [sp, #0x4] @@ -611,7 +611,7 @@ sub_0202BC98: ; 0x0202BC98 mov r1, #0xe0 str r2, [sp, #0x10] add r4, r3, #0x0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r6, r0, #0x0 mov r0, #0x0 str r0, [sp, #0x0] @@ -643,7 +643,7 @@ sub_0202BC98: ; 0x0202BC98 bl sub_0202BAD4 _0202BCEA: add r0, r6, #0x0 - bl FreeToHeap + bl Heap_Free add sp, #0x14 pop {r4-r7, pc} @@ -722,7 +722,7 @@ sub_0202BD6C: ; 0x0202BD6C str r0, [sp, #0x4] ldr r0, [sp, #0x0] mov r1, #0x4c - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x0 mov r2, #0x4c add r7, r0, #0x0 @@ -766,7 +766,7 @@ _0202BDC4: blt _0202BDC4 _0202BDE2: ldr r0, [sp, #0x8] - bl FreeToHeap + bl Heap_Free add r0, r7, #0x0 add sp, #0x10 pop {r3-r7, pc} @@ -780,7 +780,7 @@ sub_0202BDF0: ; 0x0202BDF0 str r1, [sp, #0x0] add r0, r7, #0x0 mov r1, #0x4c - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x0 mov r2, #0x4c add r4, r0, #0x0 @@ -855,5 +855,5 @@ _0202BE7E: mov r2, #0x4c bl MI_CpuFill8 add r0, r6, #0x0 - bl FreeToHeap + bl Heap_Free pop {r4-r6, pc} diff --git a/arm9/asm/unk_0202D4C4.s b/arm9/asm/unk_0202D4C4.s index 3624bd45c..0967a3117 100644 --- a/arm9/asm/unk_0202D4C4.s +++ b/arm9/asm/unk_0202D4C4.s @@ -455,7 +455,7 @@ sub_0202D7D8: ; 0x0202D7D8 lsl r7, r4, #0x4 mov r0, #0xf add r1, r7, #0x0 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x0 add r2, r7, #0x0 str r0, [r5, #0x18] @@ -485,11 +485,11 @@ sub_0202D804: ; 0x0202D804 thumb_func_start sub_0202D824 sub_0202D824: ; 0x0202D824 - ldr r3, _0202D82C ; =FreeToHeap + ldr r3, _0202D82C ; =Heap_Free ldr r0, [r0, #0x18] bx r3 nop -_0202D82C: .word FreeToHeap +_0202D82C: .word Heap_Free thumb_func_start sub_0202D830 sub_0202D830: ; 0x0202D830 diff --git a/arm9/asm/unk_0202D8D0.s b/arm9/asm/unk_0202D8D0.s index 3cf133c82..316118d21 100644 --- a/arm9/asm/unk_0202D8D0.s +++ b/arm9/asm/unk_0202D8D0.s @@ -48,7 +48,7 @@ sub_0202D8D0: ; 0x0202D8D0 bne _0202D8EC mov r0, #0xf mov r1, #0x18 - bl AllocFromHeap + bl Heap_Alloc ldr r1, _0202D914 ; =UNK_021C59E0 str r0, [r1, #0x0] _0202D8EC: @@ -82,7 +82,7 @@ sub_0202D918: ; 0x0202D918 ldr r0, [r0, #0x0] cmp r0, #0x0 beq _0202D92C - bl FreeToHeap + bl Heap_Free ldr r0, _0202D930 ; =UNK_021C59E0 mov r1, #0x0 str r1, [r0, #0x0] diff --git a/arm9/asm/unk_0202DB14.s b/arm9/asm/unk_0202DB14.s index aaad77d9b..2e5f9a95a 100644 --- a/arm9/asm/unk_0202DB14.s +++ b/arm9/asm/unk_0202DB14.s @@ -24,7 +24,7 @@ sub_0202DB14: ; 0x0202DB14 mov r1, #0xe9 mov r0, #0xf lsl r1, r1, #0x2 - bl AllocFromHeap + bl Heap_Alloc ldr r1, _0202DBA0 ; =UNK_021C59E4 mov r2, #0xe9 str r0, [r1, #0x0] @@ -104,7 +104,7 @@ _0202DBB8: ldr r0, [r0, #0x0] cmp r0, #0x0 beq _0202DBD2 - bl FreeToHeap + bl Heap_Free _0202DBD2: ldr r0, _0202DBDC ; =UNK_021C59E4 mov r1, #0x0 diff --git a/arm9/asm/unk_02033B68.s b/arm9/asm/unk_02033B68.s index 5c0423952..de742934b 100644 --- a/arm9/asm/unk_02033B68.s +++ b/arm9/asm/unk_02033B68.s @@ -75,7 +75,7 @@ sub_02033B68: ; 0x02033B68 bl sub_02033D9C add r0, r4, #0x0 mov r1, #0x20 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0x0 ldr r0, _02033BC4 ; =sub_02033BC8 add r1, r4, #0x0 @@ -276,7 +276,7 @@ sub_02033CD4: ; 0x02033CD4 strh r1, [r0, #0x4] _02033CF6: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} nop _02033D00: .word 0x40000200 @@ -320,7 +320,7 @@ sub_02033D3C: ; 0x02033D3C add r0, r3, #0x0 lsl r1, r1, #0x2 add r4, r2, #0x0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd str r0, [sp, #0x4] cmp r0, #0x0 beq _02033D92 @@ -350,7 +350,7 @@ _02033D80: bl GXS_LoadOBJPltt _02033D8C: ldr r0, [sp, #0x4] - bl FreeToHeap + bl Heap_Free _02033D92: add sp, #0x8 pop {r3-r5, pc} @@ -366,7 +366,7 @@ sub_02033D9C: ; 0x02033D9C add r5, r0, #0x0 add r0, r2, #0x0 lsl r1, r1, #0x2 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd str r0, [sp, #0x4] cmp r0, #0x0 beq _02033E58 @@ -456,7 +456,7 @@ _02033E46: bl GXS_LoadOBJ _02033E52: ldr r0, [sp, #0x4] - bl FreeToHeap + bl Heap_Free _02033E58: add sp, #0x8 pop {r3-r5, pc} diff --git a/arm9/asm/unk_02034A28.s b/arm9/asm/unk_02034A28.s index a07392cd7..932f2ce71 100644 --- a/arm9/asm/unk_02034A28.s +++ b/arm9/asm/unk_02034A28.s @@ -15,7 +15,7 @@ sub_02034A28: ; 0x02034A28 _02034A38: ldr r1, _02034A44 ; =0x00000AC8 add r0, r4, #0x0 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x14] pop {r3-r5, pc} .balign 4 @@ -31,7 +31,7 @@ sub_02034A48: ; 0x02034A48 bl GF_AssertFail _02034A56: ldr r0, [r4, #0x14] - bl FreeToHeap + bl Heap_Free pop {r4, pc} .balign 4 diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s index 669c24e3f..49f6d6815 100644 --- a/arm9/asm/unk_02035068.s +++ b/arm9/asm/unk_02035068.s @@ -300,7 +300,7 @@ sub_02035254: ; 0x02035254 mov r1, #0x2 mov r0, #0xb lsl r1, r1, #0x8 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x0 strh r2, [r0, #0x2a] mov r1, #0x7e @@ -506,7 +506,7 @@ _020353D6: add r1, r5, #0x0 bl sub_0203598C add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free ldr r0, [r5, #0x34] bl MapObjectManager_UnpauseAllMovement mov r0, #0x1 @@ -535,10 +535,10 @@ _02035412: add r0, r6, #0x0 bl TaskManager_Jump add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free b _02035484 _02035432: - bl FreeToHeap + bl Heap_Free ldr r0, [r5, #0x34] bl MapObjectManager_UnpauseAllMovement mov r0, #0x1 @@ -559,7 +559,7 @@ _02035440: mov r1, #0x3 bl ScheduleBgTilemapBufferTransfer add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free ldr r0, [r5, #0x34] bl MapObjectManager_UnpauseAllMovement mov r0, #0x1 @@ -1661,7 +1661,7 @@ sub_02035D34: ; 0x02035D34 add r6, r0, #0x0 mov r0, #0xb mov r1, #0x20 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 ldr r0, [r5, #0xc] bl Save_Pokedex_Get @@ -1731,7 +1731,7 @@ sub_02035DC8: ; 0x02035DC8 cmp r1, #0x0 beq _02035DF0 mov r0, #0xb - bl FreeToHeapExplicit + bl Heap_FreeExplicit _02035DF0: mov r0, #0xc strh r0, [r4, #0x2a] @@ -1794,7 +1794,7 @@ sub_02035E50: ; 0x02035E50 add r4, r0, #0x0 mov r0, #0xb mov r1, #0x40 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x7e lsl r1, r1, #0x2 ldr r1, [r4, r1] @@ -1804,7 +1804,7 @@ sub_02035E50: ; 0x02035E50 mov r0, #0x7e lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free add r0, r6, #0x0 add r0, #0x23 ldrb r0, [r0, #0x0] @@ -1846,7 +1846,7 @@ _02035E9C: ; jump table (using 16-bit offset) _02035ECC: mov r0, #0xb mov r1, #0x30 - bl AllocFromHeap + bl Heap_Alloc add r7, r0, #0x0 ldr r0, [r5, #0xc] bl SaveArray_Party_Get @@ -1898,7 +1898,7 @@ _02035ECC: _02035F4A: mov r0, #0xb mov r1, #0x30 - bl AllocFromHeap + bl Heap_Alloc add r7, r0, #0x0 ldr r0, [r5, #0xc] bl SaveArray_Party_Get @@ -1938,7 +1938,7 @@ _02035F4A: bl sub_0203796C mov r0, #0xb mov r1, #0x4 - bl AllocFromHeap + bl Heap_Alloc ldrh r1, [r6, #0x24] strh r1, [r0, #0x0] mov r1, #0x0 @@ -1955,7 +1955,7 @@ _02035F4A: _02035FD0: mov r0, #0xb mov r1, #0x30 - bl AllocFromHeap + bl Heap_Alloc add r7, r0, #0x0 ldr r0, [r5, #0xc] bl SaveArray_Party_Get @@ -1995,7 +1995,7 @@ _02035FD0: bl sub_0203796C mov r0, #0xb mov r1, #0x4 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x0 strh r1, [r0, #0x0] ldr r1, [r6, #0x34] @@ -2080,7 +2080,7 @@ _020360AC: _020360EA: mov r0, #0xb mov r1, #0x4 - bl AllocFromHeap + bl Heap_Alloc add r1, r6, #0x0 add r1, #0x22 ldrb r1, [r1, #0x0] @@ -2119,7 +2119,7 @@ _020360EA: _02036144: mov r0, #0xb mov r1, #0xc - bl AllocFromHeap + bl Heap_Alloc ldrh r1, [r6, #0x24] strh r1, [r0, #0x2] mov r1, #0x3 @@ -2141,7 +2141,7 @@ _02036144: _02036170: mov r0, #0xb mov r1, #0xc - bl AllocFromHeap + bl Heap_Alloc add r7, r0, #0x0 ldr r0, [r5, #0x1c] ldr r0, [r0, #0x0] @@ -2256,7 +2256,7 @@ _02036254: strh r0, [r4, #0x2a] _0203625E: add r0, r6, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x0 add sp, #0xc pop {r4-r7, pc} @@ -2338,7 +2338,7 @@ sub_020362E4: ; 0x020362E4 mov r0, #0x7e lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free ldr r0, [sp, #0x8] bl sub_0206E384 cmp r0, #0x5 @@ -2394,7 +2394,7 @@ _0203637A: _0203638A: mov r0, #0xb mov r1, #0x40 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x0 mov r2, #0x40 add r5, r0, #0x0 @@ -2455,7 +2455,7 @@ _020363F6: mov r0, #0x7f lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free add r0, r5, #0x0 bl ItemIdIsMail cmp r0, #0x1 @@ -2494,7 +2494,7 @@ _020363F6: _02036474: mov r0, #0xb mov r1, #0x40 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x0 mov r2, #0x40 add r5, r0, #0x0 @@ -2554,7 +2554,7 @@ _020364EE: strh r0, [r4, #0x2a] _020364F8: ldr r0, [sp, #0x8] - bl FreeToHeap + bl Heap_Free mov r0, #0x0 add sp, #0x18 pop {r3-r7, pc} @@ -2689,7 +2689,7 @@ sub_020365F0: ; 0x020365F0 _02036618: mov r0, #0x20 mov r1, #0x8 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x7e lsl r1, r1, #0x2 str r0, [r4, r1] @@ -2738,7 +2738,7 @@ _02036676: _02036678: strh r0, [r4, #0x2a] add r0, r5, #0x0 - bl FreeToHeap + bl Heap_Free pop {r4-r6, pc} .balign 4 @@ -2794,7 +2794,7 @@ sub_020366D4: ; 0x020366D4 mov r0, #0x7e lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free add r0, r5, #0x0 bl FieldSystem_LoadFieldOverlay mov r0, #0xc @@ -2949,7 +2949,7 @@ _02036834: bl StartScriptFromMenu _0203683E: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x0 pop {r4-r6, pc} .balign 4 @@ -2966,7 +2966,7 @@ sub_0203684C: ; 0x0203684C add r4, r0, #0x0 mov r0, #0xb mov r1, #0x30 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x7e lsl r1, r1, #0x2 ldr r1, [r4, r1] @@ -2976,13 +2976,13 @@ sub_0203684C: ; 0x0203684C mov r0, #0x7e lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free ldrb r0, [r7, #0x12] cmp r0, #0x2 bne _0203692E mov r0, #0xb mov r1, #0x40 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x7f lsl r1, r1, #0x2 ldr r1, [r4, r1] @@ -3050,7 +3050,7 @@ _020368EE: mov r0, #0x7f lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free mov r0, #0x7e lsl r0, r0, #0x2 str r5, [r4, r0] @@ -3073,7 +3073,7 @@ _0203692E: bl StartMenu_SetExitTaskFunc _0203694A: add r0, r7, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x0 pop {r3-r7, pc} .balign 4 @@ -3193,7 +3193,7 @@ sub_02036A14: ; 0x02036A14 lsl r1, r1, #0x2 ldr r1, [r4, r1] mov r0, #0xb - bl FreeToHeapExplicit + bl Heap_FreeExplicit mov r1, #0x73 lsl r1, r1, #0x2 add r0, r5, #0x0 @@ -3223,7 +3223,7 @@ sub_02036A78: ; 0x02036A78 lsl r1, r1, #0x2 ldr r1, [r4, r1] mov r0, #0xb - bl FreeToHeapExplicit + bl Heap_FreeExplicit mov r1, #0x73 lsl r1, r1, #0x2 add r0, r5, #0x0 @@ -3255,7 +3255,7 @@ Task_UseFlyInField: ; 0x02036AB8 ldr r1, [r4, r0] mov r0, #0xb ldr r7, [r1, #0x0] - bl FreeToHeapExplicit + bl Heap_FreeExplicit mov r0, #0x7e lsl r0, r0, #0x2 ldr r5, [r4, r0] @@ -3264,7 +3264,7 @@ Task_UseFlyInField: ; 0x02036AB8 bne _02036B0E mov r0, #0xb add r1, r5, #0x0 - bl FreeToHeapExplicit + bl Heap_FreeExplicit mov r1, #0x7a lsl r1, r1, #0x2 lsl r2, r7, #0x18 @@ -3320,7 +3320,7 @@ _02036B0E: lsl r1, r1, #0x2 ldr r1, [r4, r1] mov r0, #0xb - bl FreeToHeapExplicit + bl Heap_FreeExplicit add r0, r6, #0x0 bl FieldSystem_LoadFieldOverlay mov r0, #0x72 @@ -3372,7 +3372,7 @@ sub_02036BC4: ; 0x02036BC4 mov r0, #0xb mov r1, #0x4 add r6, r2, #0x0 - bl AllocFromHeap + bl Heap_Alloc strh r5, [r0, #0x0] strb r6, [r0, #0x2] strb r4, [r0, #0x3] @@ -3497,7 +3497,7 @@ _02036CD4: mov r0, #0x7f lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free mov r0, #0x0 pop {r4-r6, pc} nop @@ -3515,7 +3515,7 @@ sub_02036CEC: ; 0x02036CEC ldr r7, [r6, r0] mov r0, #0xb mov r1, #0x40 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x0 mov r2, #0x40 add r4, r0, #0x0 @@ -3649,7 +3649,7 @@ sub_02036E08: ; 0x02036E08 mov r0, #0x3 mov r1, #0x49 lsl r2, r0, #0x10 - bl CreateHeap + bl Heap_Create ldr r0, [r4, #0xc] bl SaveArray_Party_Get ldrb r1, [r5, #0x0] @@ -3736,7 +3736,7 @@ _02036EF2: add r4, r0, #0x0 mov r0, #0xb mov r1, #0x4 - bl AllocFromHeap + bl Heap_Alloc ldrb r1, [r5, #0x0] str r1, [r0, #0x0] mov r1, #0x7f @@ -3744,7 +3744,7 @@ _02036EF2: str r0, [r6, r1] sub r0, r1, #0x4 ldr r0, [r6, r0] - bl FreeToHeap + bl Heap_Free mov r0, #0x7e lsl r0, r0, #0x2 str r4, [r6, r0] @@ -3773,7 +3773,7 @@ sub_02036F1C: ; 0x02036F1C ldr r0, [r4, r0] bl sub_0206C92C mov r0, #0x49 - bl DestroyHeap + bl Heap_Destroy ldr r0, _02036F9C ; =0x00000475 mov r1, #0x0 bl sub_02005350 @@ -3801,7 +3801,7 @@ sub_02036F1C: ; 0x02036F1C mov r0, #0x7f lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free ldr r1, _02036FA0 ; =sub_020362E4 add r0, r4, #0x0 bl StartMenu_SetExitTaskFunc diff --git a/arm9/asm/unk_020372D4.s b/arm9/asm/unk_020372D4.s index f5910cbfb..8f7674c41 100644 --- a/arm9/asm/unk_020372D4.s +++ b/arm9/asm/unk_020372D4.s @@ -187,16 +187,16 @@ sub_02037400: ; 0x02037400 mov r0, #0x3 mov r1, #0xb lsl r2, r2, #0xe - bl CreateHeap + bl Heap_Create mov r1, #0x20 mov r0, #0x3 lsl r2, r1, #0x9 - bl CreateHeap + bl Heap_Create mov r2, #0x3 mov r0, #0x0 mov r1, #0x5b lsl r2, r2, #0x8 - bl CreateHeap + bl Heap_Create add r0, r5, #0x0 mov r1, #0xb8 mov r2, #0xb @@ -207,7 +207,7 @@ sub_02037400: ; 0x02037400 bl MI_CpuFill8 mov r0, #0xb mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #0x0] mov r1, #0x0 str r1, [r0, #0x0] @@ -268,7 +268,7 @@ sub_020374B0: ; 0x020374B0 add r0, r4, #0x0 add r0, #0x94 ldr r0, [r0, #0x0] - bl FreeToHeap + bl Heap_Free add r0, r4, #0x0 add r0, #0x90 ldr r0, [r0, #0x0] @@ -278,15 +278,15 @@ sub_020374B0: ; 0x020374B0 ldr r0, [r0, #0x0] bl sub_0208A320 ldr r0, [r4, #0x0] - bl FreeToHeap + bl Heap_Free add r0, r5, #0x0 bl OverlayManager_FreeData mov r0, #0x5b - bl DestroyHeap + bl Heap_Destroy mov r0, #0xb - bl DestroyHeap + bl Heap_Destroy mov r0, #0x20 - bl DestroyHeap + bl Heap_Destroy pop {r3-r5, pc} thumb_func_start sub_02037504 diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s index ec8d80e4c..a99a97dd3 100644 --- a/arm9/asm/unk_020377F0.s +++ b/arm9/asm/unk_020377F0.s @@ -422,7 +422,7 @@ sub_0203797C: ; 0x0203797C mov r1, #0x40 add r6, r2, #0x0 add r7, r3, #0x0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 mov r0, #0x0 add r1, r4, #0x0 @@ -634,13 +634,13 @@ _02037B1A: cmp r0, #0x0 bne _02037B3A ldr r0, [r4, #0x8] - bl FreeToHeap + bl Heap_Free mov r0, #0x0 str r0, [r5, #0x0] b _02037B3A _02037B30: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x1 pop {r4-r6, pc} _02037B3A: @@ -658,7 +658,7 @@ sub_02037B44: ; 0x02037B44 add r6, r0, #0x0 add r0, r5, #0x0 mov r1, #0xc - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 add r0, r5, #0x0 add r1, r6, #0x0 @@ -752,7 +752,7 @@ sub_02037C00: ; 0x02037C00 mov r0, #0xb mov r1, #0x30 add r6, r2, #0x0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 ldr r0, [r5, #0xc] bl SaveArray_Party_Get @@ -805,7 +805,7 @@ sub_02037C7C: ; 0x02037C7C add r0, r1, #0x0 mov r1, #0x30 add r6, r2, #0x0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0x0 mov r2, #0x30 add r4, r0, #0x0 @@ -854,7 +854,7 @@ sub_02037CF0: ; 0x02037CF0 add r5, r1, #0x0 mov r1, #0x30 add r6, r2, #0x0 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x0 mov r2, #0x30 add r4, r0, #0x0 @@ -985,7 +985,7 @@ _02037E00: ldr r0, [r5, #0xc] bl sub_020853A8 add r0, r5, #0x0 - bl FreeToHeap + bl Heap_Free add sp, #0x4 mov r0, #0x1 pop {r3-r6, pc} @@ -1006,7 +1006,7 @@ sub_02037E18: ; 0x02037E18 add r7, r0, #0x0 mov r0, #0x20 mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 ldr r0, [sp, #0x4] cmp r6, #0x0 @@ -1084,7 +1084,7 @@ sub_02037EB8: ; 0x02037EB8 mov r1, #0x5 mov r0, #0xb lsl r1, r1, #0x6 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0x0 add r0, r5, #0x0 add r1, r4, #0x0 @@ -1112,7 +1112,7 @@ sub_02037EF8: ; 0x02037EF8 add r5, r0, #0x0 mov r0, #0xb mov r1, #0x2 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0x0 add r0, r5, #0x0 bl FieldSystem_GetSaveData @@ -1255,7 +1255,7 @@ sub_0203800C: ; 0x0203800C mov r1, #0x20 add r7, r2, #0x0 add r6, r3, #0x0 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x0 mov r2, #0x20 add r4, r0, #0x0 @@ -1330,9 +1330,9 @@ _020380B4: ldr r0, [r5, #0x4] strh r1, [r0, #0x0] ldr r0, [r5, #0xc] - bl FreeToHeap + bl Heap_Free add r0, r5, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x1 pop {r3-r5, pc} _020380C8: @@ -1349,7 +1349,7 @@ sub_020380CC: ; 0x020380CC mov r1, #0x10 add r7, r2, #0x0 str r3, [sp, #0x4] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 add r2, r4, #0x0 mov r1, #0x10 @@ -1440,17 +1440,17 @@ sub_02038144: ; 0x02038144 bl PlayerProfile_sizeof add r1, r0, #0x0 mov r0, #0x20 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x38] bl sub_020690C4 add r1, r0, #0x0 mov r0, #0x20 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x3c] bl sub_020690C4 add r1, r0, #0x0 mov r0, #0x20 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x40] str r4, [r5, #0x0] mov r0, #0x0 @@ -1465,21 +1465,21 @@ sub_020381CC: ; 0x020381CC ldr r0, [r4, #0x38] cmp r0, #0x0 beq _020381DE - bl FreeToHeap + bl Heap_Free mov r0, #0x0 str r0, [r4, #0x38] _020381DE: ldr r0, [r4, #0x3c] cmp r0, #0x0 beq _020381EC - bl FreeToHeap + bl Heap_Free mov r0, #0x0 str r0, [r4, #0x3c] _020381EC: ldr r0, [r4, #0x40] cmp r0, #0x0 beq _020381FA - bl FreeToHeap + bl Heap_Free mov r0, #0x0 str r0, [r4, #0x40] _020381FA: @@ -1549,7 +1549,7 @@ _0203826A: add r0, r4, #0x4 bl sub_020381CC add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free add sp, #0x34 mov r0, #0x1 pop {r4-r7, pc} @@ -1633,7 +1633,7 @@ _020382F6: mov r0, #0x3 mov r1, #0x1a lsl r2, r0, #0x10 - bl CreateHeap + bl Heap_Create ldr r0, [r5, #0xc] bl Save_PlayerData_GetOptionsAddr str r0, [sp, #0x24] @@ -1691,7 +1691,7 @@ _02038386: ldr r0, [r4, #0x60] bl sub_0206C92C mov r0, #0x1a - bl DestroyHeap + bl Heap_Destroy mov r0, #0x7 str r0, [r4, #0x0] b _020383C8 @@ -1719,7 +1719,7 @@ sub_020383D8: ; 0x020383D8 add r4, r0, #0x0 mov r0, #0x20 mov r1, #0x68 - bl AllocFromHeap + bl Heap_Alloc add r2, r0, #0x0 mov r0, #0x0 str r0, [r2, #0x0] @@ -1736,7 +1736,7 @@ sub_020383F8: ; 0x020383F8 add r5, r0, #0x0 mov r0, #0x20 mov r1, #0xc - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 ldr r0, [r5, #0x7c] str r0, [r4, #0x0] @@ -1761,7 +1761,7 @@ sub_0203842C: ; 0x0203842C add r5, r0, #0x0 mov r0, #0xb mov r1, #0x14 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 ldr r0, [r5, #0xc] str r0, [r4, #0x0] @@ -1891,7 +1891,7 @@ _0203852E: ldr r0, [r4, #0x10] bl String_Delete add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x1 pop {r3-r7, pc} _02038544: @@ -1975,7 +1975,7 @@ CreateNamingScreen: ; 0x020385CC add r7, r0, #0x0 mov r0, #0xb mov r1, #0x14 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0x0 mov r0, #0x0 str r0, [r4, #0x0] @@ -2114,7 +2114,7 @@ sub_020386E0: ; 0x020386E0 stmia r2!, {r0-r1} mov r0, #0xb mov r1, #0x44 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0x0 ldr r0, [r5, #0xc] bl sub_0202ABBC @@ -2190,7 +2190,7 @@ sub_02038790: ; 0x02038790 stmia r2!, {r0-r1} mov r0, #0xb mov r1, #0x28 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0x0 ldr r0, [r5, #0xc] bl Save_FrontierData_Get @@ -2258,7 +2258,7 @@ sub_02038824: ; 0x02038824 add r4, r0, #0x0 cmp r1, #0x2 bne _02038842 - bl FreeToHeap + bl Heap_Free mov r0, #0x0 pop {r3-r5, pc} _02038842: @@ -2441,7 +2441,7 @@ _02038956: bl sub_0205F6D8 _020389BA: add r0, r5, #0x0 - bl FreeToHeap + bl Heap_Free add sp, #0xc mov r0, #0x1 pop {r4-r7, pc} @@ -2462,7 +2462,7 @@ sub_020389CC: ; 0x020389CC str r0, [sp, #0x0] mov r0, #0x20 add r1, r0, #0x0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 str r4, [r4, #0xc] ldr r0, [r5, #0xc] @@ -2595,7 +2595,7 @@ sub_02038AF4: ; 0x02038AF4 add r0, r1, #0x0 mov r1, #0x8 add r6, r2, #0x0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 str r6, [r4, #0x4] ldr r0, [r5, #0xc] diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s index f89fa8d60..0b37d47af 100644 --- a/arm9/asm/unk_02038C78.s +++ b/arm9/asm/unk_02038C78.s @@ -1064,7 +1064,7 @@ _02038DD2: mov r0, #0x0 str r0, [r4, #0x0] add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free cmp r5, #0x0 beq _02038E14 ldr r0, [sp, #0x0] @@ -1086,7 +1086,7 @@ CreateFieldContext: ; 0x02038E20 push {r4, lr} mov r0, #0xb mov r1, #0xdc - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 bne _02038E32 bl GF_AssertFail @@ -1109,9 +1109,9 @@ DeleteScriptContext: ; 0x02038E48 ldr r0, [r4, #0x78] bl DestroyMsgData ldr r0, [r4, #0x7c] - bl FreeToHeap + bl Heap_Free add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_start sub_02038E60 @@ -1161,7 +1161,7 @@ CreateScriptContext: ; 0x02038EB0 add r6, r1, #0x0 mov r0, #0xb mov r1, #0x84 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 bne _02038EC6 bl GF_AssertFail @@ -2313,7 +2313,7 @@ sub_02039754: ; 0x02039754 mov r1, #0x6 add r0, r4, #0x0 mul r1, r2 - bl AllocFromHeap + bl Heap_Alloc str r0, [sp, #0x1c] cmp r5, #0x0 bne _02039786 diff --git a/arm9/asm/unk_02046030.s b/arm9/asm/unk_02046030.s index 46c9c27f3..231740d71 100644 --- a/arm9/asm/unk_02046030.s +++ b/arm9/asm/unk_02046030.s @@ -11,7 +11,7 @@ CallTask_UseSunyshoreBinoculars: ; 0x02046030 add r4, r0, #0x0 mov r0, #0xb mov r1, #0xc - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r2, r0, #0x0 mov r0, #0x0 strb r0, [r2, #0x0] @@ -217,7 +217,7 @@ _020461CE: b _020461F8 _020461E4: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0x0 mov r1, #0x0 bl sub_0206367C diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s index 9bea3a3fb..6b987c385 100644 --- a/arm9/asm/unk_020476CC.s +++ b/arm9/asm/unk_020476CC.s @@ -18,7 +18,7 @@ BattleSetup_New: ; 0x020476CC mov r1, #0x67 lsl r1, r1, #0x2 add r5, r0, #0x0 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x67 mov r1, #0x0 lsl r2, r2, #0x2 @@ -283,7 +283,7 @@ sub_02047814: ; 0x02047814 add r1, r6, #0x0 bl Party_AddMon add r0, r6, #0x0 - bl FreeToHeap + bl Heap_Free ldr r0, [r5, #0xc] bl SaveArray_PCStorage_Get mov r1, #0x45 @@ -330,7 +330,7 @@ _0204796C: bl GF_AssertFail _02047976: ldr r0, [r5, #0x4] - bl FreeToHeap + bl Heap_Free add r4, r4, #0x1 add r5, r5, #0x4 cmp r4, #0x4 @@ -348,7 +348,7 @@ _02047996: add r0, r4, #0x0 add r0, #0xf8 ldr r0, [r0, #0x0] - bl FreeToHeap + bl Heap_Free add r5, r5, #0x1 add r4, r4, #0x4 cmp r5, #0x4 @@ -366,7 +366,7 @@ _020479BA: mov r0, #0x46 lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free add r5, r5, #0x1 add r4, r4, #0x4 cmp r5, #0x4 @@ -374,21 +374,21 @@ _020479BA: mov r0, #0x42 lsl r0, r0, #0x2 ldr r0, [r7, r0] - bl FreeToHeap + bl Heap_Free mov r0, #0x11 lsl r0, r0, #0x4 ldr r0, [r7, r0] - bl FreeToHeap + bl Heap_Free mov r0, #0x13 lsl r0, r0, #0x4 ldr r0, [r7, r0] - bl FreeToHeap + bl Heap_Free mov r0, #0x4d lsl r0, r0, #0x2 ldr r0, [r7, r0] bl sub_02061020 add r0, r7, #0x0 - bl FreeToHeap + bl Heap_Free pop {r3-r7, pc} thumb_func_start sub_020479FC @@ -697,7 +697,7 @@ _02047C82: blt _02047C40 _02047C98: add r0, r5, #0x0 - bl FreeToHeap + bl Heap_Free mov r1, #0x42 lsl r1, r1, #0x2 ldr r0, [sp, #0x10] @@ -868,7 +868,7 @@ _02047DEE: blt _02047DEE _02047E0E: ldr r0, [sp, #0x8] - bl FreeToHeap + bl Heap_Free _02047E14: ldr r0, [sp, #0xc] cmp r0, #0x0 diff --git a/arm9/asm/unk_020484A8.s b/arm9/asm/unk_020484A8.s index 57a727eb0..f86c9198c 100644 --- a/arm9/asm/unk_020484A8.s +++ b/arm9/asm/unk_020484A8.s @@ -53,7 +53,7 @@ _020484CC: add r1, r4, #0x0 bl SaveHallOfFame add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free add sp, #0x14 pop {r3-r6, pc} .balign 4 @@ -110,7 +110,7 @@ _02048556: mov r1, #0x4 mov r0, #0x3 lsl r2, r1, #0xf - bl CreateHeap + bl Heap_Create add r0, r6, #0x0 add r1, r5, #0x0 bl sub_02048764 @@ -238,9 +238,9 @@ _02048666: cmp r0, #0x0 bne _02048688 add r0, r5, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x4 - bl DestroyHeap + bl Heap_Destroy mov r0, #0x0 bl OS_ResetSystem add sp, #0xc @@ -262,7 +262,7 @@ CallTask_GameClear: ; 0x02048694 add r4, r0, #0x0 mov r0, #0x20 mov r1, #0x3c - bl AllocFromHeap + bl Heap_Alloc add r5, r0, #0x0 ldr r0, [r4, #0xc] bl Save_VarsFlags_Get diff --git a/arm9/asm/unk_02048904.s b/arm9/asm/unk_02048904.s index c0f640a4b..e8eecf404 100644 --- a/arm9/asm/unk_02048904.s +++ b/arm9/asm/unk_02048904.s @@ -847,7 +847,7 @@ _02048FAE: b _02048FC4 _02048FBA: add r0, r6, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x1 pop {r3-r7, pc} _02048FC4: @@ -882,7 +882,7 @@ _02048FF8: _02049000: mov r0, #0xb mov r1, #0x18 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r2, r0, #0x0 mov r1, #0x0 ldr r0, _02049030 ; =0x000001D2 @@ -962,7 +962,7 @@ _02049090: str r0, [r4, #0x0] b _020490B6 _020490AE: - bl FreeToHeap + bl Heap_Free mov r0, #0x1 pop {r4-r6, pc} _020490B6: @@ -978,7 +978,7 @@ sub_020490C0: ; 0x020490C0 add r4, r1, #0x0 mov r0, #0xb mov r1, #0x1c - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r2, r0, #0x0 mov r0, #0x0 str r0, [r2, #0x0] @@ -1042,7 +1042,7 @@ _0204914C: add r0, r5, #0x0 bl sub_02048AE4 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x1 pop {r3-r5, pc} _0204915C: @@ -1058,7 +1058,7 @@ sub_02049160: ; 0x02049160 add r7, r0, #0x0 mov r0, #0xb mov r1, #0x18 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0x0 add r0, r7, #0x0 bl sub_0203739C @@ -1155,7 +1155,7 @@ _02049216: str r0, [r4, #0x0] b _0204923C _02049234: - bl FreeToHeap + bl Heap_Free mov r0, #0x1 pop {r4-r6, pc} _0204923C: @@ -1171,7 +1171,7 @@ CallTask_ScriptWarp: ; 0x02049240 mov r1, #0x18 add r4, r2, #0x0 add r6, r3, #0x0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r2, r0, #0x0 mov r0, #0x0 str r0, [r2, #0x0] @@ -1203,7 +1203,7 @@ sub_02049274: ; 0x02049274 mov r0, #0xb str r2, [sp, #0x4] str r3, [sp, #0x8] - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r2, r0, #0x0 mov r0, #0x0 str r0, [r2, #0x0] @@ -1239,7 +1239,7 @@ sub_020492BC: ; 0x020492BC mov r0, #0xb str r2, [sp, #0x4] str r3, [sp, #0x8] - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r2, r0, #0x0 mov r0, #0x0 str r0, [r2, #0x0] @@ -1324,7 +1324,7 @@ _02049364: str r0, [r4, #0x0] b _02049390 _02049388: - bl FreeToHeap + bl Heap_Free mov r0, #0x1 pop {r3-r7, pc} _02049390: @@ -1473,7 +1473,7 @@ sub_02049494: ; 0x02049494 mov r0, #0xb mov r1, #0x20 add r4, r2, #0x0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r2, r0, #0x0 mov r0, #0x0 str r0, [r2, #0x0] @@ -1570,7 +1570,7 @@ _0204955A: str r0, [r4, #0x0] b _02049570 _02049568: - bl FreeToHeap + bl Heap_Free mov r0, #0x1 pop {r3-r7, pc} _02049570: @@ -1786,7 +1786,7 @@ _020496FE: str r0, [r4, #0x0] b _02049712 _0204970A: - bl FreeToHeap + bl Heap_Free mov r0, #0x1 pop {r3-r7, pc} _02049712: @@ -1803,7 +1803,7 @@ sub_02049718: ; 0x02049718 mov r0, #0xb mov r1, #0x1c add r6, r2, #0x0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0x0 mov r2, #0x1c add r7, r0, #0x0 @@ -1844,7 +1844,7 @@ sub_0204976C: ; 0x0204976C add r4, r0, #0x0 mov r0, #0xb mov r1, #0x40 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r5, r0, #0x0 mov r1, #0x0 str r1, [r5, #0x0] @@ -2137,7 +2137,7 @@ _020499D0: ldr r0, [r5, #0x34] bl MapObjectManager_UnpauseAllMovement add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free add sp, #0x8 mov r0, #0x1 pop {r4-r6, pc} @@ -2231,7 +2231,7 @@ _02049A96: mov r0, #0x1 bl ov18_02247970 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free add sp, #0x8 mov r0, #0x1 pop {r4-r6, pc} @@ -2370,7 +2370,7 @@ _02049BBE: str r0, [r4, #0x0] b _02049BDC _02049BD2: - bl FreeToHeap + bl Heap_Free add sp, #0x8 mov r0, #0x1 pop {r4-r6, pc} @@ -2480,7 +2480,7 @@ _02049C9C: add r0, r5, #0x0 bl sub_02048AE4 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x1 pop {r3-r5, pc} _02049CAC: @@ -2496,7 +2496,7 @@ sub_02049CB0: ; 0x02049CB0 add r7, r0, #0x0 mov r0, #0xb mov r1, #0x18 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0x0 add r0, r7, #0x0 bl sub_0203739C @@ -2598,7 +2598,7 @@ _02049D80: b _02049D98 _02049D8E: add r0, r5, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x1 pop {r3-r7, pc} _02049D98: @@ -2615,7 +2615,7 @@ sub_02049D9C: ; 0x02049D9C add r4, r0, #0x0 mov r0, #0xb mov r1, #0x1c - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r6, r0, #0x0 mov r1, #0x0 mov r2, #0x1c @@ -2726,7 +2726,7 @@ _02049E88: b _02049E9E _02049E94: add r0, r5, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x1 pop {r3-r7, pc} _02049E9E: @@ -2746,7 +2746,7 @@ sub_02049EA4: ; 0x02049EA4 add r7, r0, #0x0 mov r0, #0xb mov r1, #0x1c - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0x0 mov r2, #0x1c add r4, r0, #0x0 @@ -2838,7 +2838,7 @@ _02049F68: str r0, [r4, #0x0] b _02049F8E _02049F86: - bl FreeToHeap + bl Heap_Free mov r0, #0x1 pop {r4-r6, pc} _02049F8E: @@ -2866,7 +2866,7 @@ sub_02049F98: ; 0x02049F98 str r0, [r4, #0x6c] mov r0, #0xb mov r1, #0x1c - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r2, r0, #0x0 ldr r0, [sp, #0x30] str r5, [sp, #0x4] diff --git a/arm9/asm/unk_0204A368.s b/arm9/asm/unk_0204A368.s index ee1ebb9ba..3972d239e 100644 --- a/arm9/asm/unk_0204A368.s +++ b/arm9/asm/unk_0204A368.s @@ -13,7 +13,7 @@ sub_0204A368: ; 0x0204A368 bne _0204A388 ldr r1, _0204A38C ; =0x000080E2 mov r0, #0xb - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x54] ldr r0, [r5, #0x28] ldr r1, [r5, #0x54] @@ -31,7 +31,7 @@ sub_0204A390: ; 0x0204A390 ldr r0, [r4, #0x54] cmp r0, #0x0 beq _0204A3A2 - bl FreeToHeap + bl Heap_Free mov r0, #0x0 str r0, [r4, #0x54] _0204A3A2: diff --git a/arm9/asm/unk_0204B34C.s b/arm9/asm/unk_0204B34C.s index c500587d8..d4d23135d 100644 --- a/arm9/asm/unk_0204B34C.s +++ b/arm9/asm/unk_0204B34C.s @@ -72,7 +72,7 @@ sub_0204B388: ; 0x0204B388 add r5, r0, #0x0 add r0, r6, #0x0 mov r1, #0x64 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 mov r1, #0x0 mov r2, #0x64 @@ -94,9 +94,9 @@ sub_0204B3B8: ; 0x0204B3B8 add r4, r0, #0x0 bl sub_0204B444 ldr r0, [r4, #0x4] - bl FreeToHeap + bl Heap_Free add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .balign 4 @@ -117,7 +117,7 @@ sub_0204B3D0: ; 0x0204B3D0 add r2, r6, #0x0 bl sub_020253E0 add r0, r5, #0x0 - bl FreeToHeap + bl Heap_Free pop {r4-r6, pc} _0204B3FA: ldr r0, [r0, #0x18] @@ -140,7 +140,7 @@ sub_0204B410: ; 0x0204B410 bl ov05_021E4C54 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x60] ldr r2, [r5, #0x60] add r0, r4, #0x0 @@ -826,7 +826,7 @@ _0204B972: bl PlayerAvatar_GetMapObject bl MapObject_PauseMovement add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x1 pop {r3-r5, pc} _0204B98E: @@ -843,7 +843,7 @@ sub_0204B9A0: ; 0x0204B9A0 add r5, r0, #0x0 mov r0, #0x20 mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 mov r0, #0x0 str r0, [r4, #0x0] diff --git a/arm9/asm/unk_0204B9EC.s b/arm9/asm/unk_0204B9EC.s index 2a4b67715..0958d1240 100644 --- a/arm9/asm/unk_0204B9EC.s +++ b/arm9/asm/unk_0204B9EC.s @@ -232,7 +232,7 @@ _0204BB72: cmp r6, #0x6 blt _0204BB3C add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free add sp, #0x10 pop {r3-r7, pc} .balign 4 @@ -495,7 +495,7 @@ sub_0204BD40: ; 0x0204BD40 mov r2, #0x1 bl sub_020479FC add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free add r0, r7, #0x0 pop {r3-r7, pc} .balign 4 diff --git a/arm9/asm/unk_0204C1B4.s b/arm9/asm/unk_0204C1B4.s index 47753d510..d57c8e824 100644 --- a/arm9/asm/unk_0204C1B4.s +++ b/arm9/asm/unk_0204C1B4.s @@ -29,7 +29,7 @@ sub_0204C1B4: ; 0x0204C1B4 mov r1, #0x20 add r4, r2, #0x0 add r6, r3, #0x0 - bl AllocFromHeap + bl Heap_Alloc add r2, r0, #0x0 str r5, [r2, #0x4] str r4, [r2, #0x8] @@ -95,7 +95,7 @@ _0204C23C: ldr r0, [r0, #0x1c] bl ov05_021F45E8 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free add sp, #0xc mov r0, #0x1 pop {r4-r5, pc} @@ -114,7 +114,7 @@ sub_0204C260: ; 0x0204C260 mov r1, #0x24 add r4, r2, #0x0 add r6, r3, #0x0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r2, r0, #0x0 mov r0, #0x0 str r0, [r2, #0x0] @@ -145,7 +145,7 @@ sub_0204C29C: ; 0x0204C29C mov r1, #0x24 str r2, [sp, #0x0] str r3, [sp, #0x4] - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r6, r0, #0x0 mov r4, #0x0 str r4, [r6, #0x0] @@ -348,7 +348,7 @@ _0204C41E: str r0, [r4, #0x0] b _0204C458 _0204C450: - bl FreeToHeap + bl Heap_Free mov r0, #0x1 pop {r3-r7, pc} _0204C458: diff --git a/arm9/asm/unk_0204CB20.s b/arm9/asm/unk_0204CB20.s index 7df00412b..6984e16cc 100644 --- a/arm9/asm/unk_0204CB20.s +++ b/arm9/asm/unk_0204CB20.s @@ -71,7 +71,7 @@ _0204CB40: bl ov18_02244D1C add r1, r0, #0x0 mov r0, #0xf - bl AllocFromHeap + bl Heap_Alloc ldr r1, _0204CC34 ; =UNK_021C5A68 ldr r2, [r1, #0x0] str r0, [r2, #0x4] @@ -281,7 +281,7 @@ _0204CCF0: ldr r0, [r1, r0] cmp r0, #0x0 beq _0204CD0E - bl FreeToHeap + bl Heap_Free ldr r0, [r7, #0x0] mov r1, #0x0 add r2, r0, r5 @@ -326,11 +326,11 @@ _0204CD2C: ldr r0, _0204CD70 ; =UNK_021C5A68 ldr r0, [r0, #0x0] ldr r0, [r0, #0x4] - bl FreeToHeap + bl Heap_Free _0204CD60: ldr r0, _0204CD70 ; =UNK_021C5A68 ldr r0, [r0, #0x0] - bl FreeToHeap + bl Heap_Free ldr r0, _0204CD70 ; =UNK_021C5A68 mov r1, #0x0 str r1, [r0, #0x0] @@ -4559,7 +4559,7 @@ sub_0204ED9C: ; 0x0204ED9C ldr r0, [r1, r0] cmp r0, #0x0 beq _0204EDE2 - bl FreeToHeap + bl Heap_Free ldr r2, _0204EDE8 ; =UNK_021C5A68 lsl r1, r4, #0x2 ldr r3, [r2, #0x0] @@ -4616,7 +4616,7 @@ sub_0204EDEC: ; 0x0204EDEC ldr r0, [r1, r0] cmp r0, #0x0 beq _0204EE2A - bl FreeToHeap + bl Heap_Free _0204EE2A: mov r0, #0x9e lsl r0, r0, #0x2 @@ -5027,7 +5027,7 @@ sub_0204F124: ; 0x0204F124 cmp r0, #0x0 bne _0204F14A add r0, r5, #0x0 - bl FreeToHeap + bl Heap_Free add r0, r6, #0x0 bl SysTask_Destroy pop {r3-r7, pc} @@ -5048,7 +5048,7 @@ _0204F156: add r0, #0xea strb r1, [r0, #0x0] add r0, r5, #0x0 - bl FreeToHeap + bl Heap_Free add r0, r6, #0x0 bl SysTask_Destroy _0204F172: @@ -5062,7 +5062,7 @@ sub_0204F178: ; 0x0204F178 add r4, r0, #0x0 mov r0, #0xb mov r1, #0x8 - bl AllocFromHeap + bl Heap_Alloc add r1, r0, #0x0 mov r2, #0x0 str r2, [r1, #0x0] @@ -6067,7 +6067,7 @@ _0204F990: add r0, r5, #0x0 bl String_Delete add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r3-r5, pc} nop _0204F9B0: .word UNK_021C5A68 @@ -6186,7 +6186,7 @@ sub_0204FA78: ; 0x0204FA78 ldr r0, [r1, r0] cmp r0, #0x0 beq _0204FA98 - bl FreeToHeap + bl Heap_Free _0204FA98: mov r0, #0xf lsl r4, r5, #0x2 diff --git a/arm9/asm/unk_0204FBA8.s b/arm9/asm/unk_0204FBA8.s index d2d2d6b1f..cfb3420d7 100644 --- a/arm9/asm/unk_0204FBA8.s +++ b/arm9/asm/unk_0204FBA8.s @@ -64,7 +64,7 @@ sub_0204FBB0: ; 0x0204FBB0 bl sub_0208881C mov r0, #0xf mov r1, #0x48 - bl AllocFromHeap + bl Heap_Alloc ldr r1, _0204FC08 ; =UNK_021C5A6C mov r2, #0x48 str r0, [r1, #0x0] @@ -114,7 +114,7 @@ _0204FC26: ldr r0, [r0, r5] cmp r0, #0x0 beq _0204FC32 - bl FreeToHeap + bl Heap_Free _0204FC32: add r4, r4, #0x1 add r5, r5, #0x4 @@ -125,11 +125,11 @@ _0204FC32: ldr r0, [r0, #0x44] cmp r0, #0x0 beq _0204FC48 - bl FreeToHeap + bl Heap_Free _0204FC48: ldr r0, _0204FC58 ; =UNK_021C5A6C ldr r0, [r0, #0x0] - bl FreeToHeap + bl Heap_Free ldr r0, _0204FC58 ; =UNK_021C5A6C mov r1, #0x0 str r1, [r0, #0x0] @@ -154,7 +154,7 @@ sub_0204FC5C: ; 0x0204FC5C mov r0, #0x3 mov r1, #0x21 lsl r2, r2, #0xa - bl CreateHeap + bl Heap_Create ldr r0, _0204FC9C ; =UNK_021C5A6C ldr r0, [r0, #0x0] ldr r0, [r0, #0x18] @@ -577,7 +577,7 @@ _0204FFCA: bne _0204FFDE ldr r1, _0205001C ; =0x0000066C add r0, r7, #0x0 - bl AllocFromHeap + bl Heap_Alloc ldr r1, [r6, #0x0] str r0, [r1, r5] _0204FFDE: @@ -1443,7 +1443,7 @@ sub_020506C8: ; 0x020506C8 bl sub_0204D320 add r1, r0, #0x0 mov r0, #0xf - bl AllocFromHeap + bl Heap_Alloc ldr r1, _02050720 ; =UNK_021C5A6C mov r2, #0x0 ldr r1, [r1, #0x0] @@ -1585,7 +1585,7 @@ sub_020507F8: ; 0x020507F8 bl sub_0204D320 add r1, r0, #0x0 mov r0, #0xf - bl AllocFromHeap + bl Heap_Alloc ldr r1, _0205084C ; =UNK_021C5A6C mov r2, #0x0 ldr r1, [r1, #0x0] @@ -1690,7 +1690,7 @@ _020508E6: ldr r0, [r0, r5] cmp r0, #0x0 beq _020508F8 - bl FreeToHeap + bl Heap_Free ldr r1, [r6, #0x0] mov r0, #0x0 str r0, [r1, r5] @@ -1944,7 +1944,7 @@ _02050ADE: ldr r0, _02050B00 ; =UNK_021C5A6C ldr r0, [r0, #0x0] ldr r0, [r0, #0x44] - bl FreeToHeap + bl Heap_Free ldr r0, _02050B00 ; =UNK_021C5A6C mov r1, #0x0 ldr r0, [r0, #0x0] @@ -2279,7 +2279,7 @@ _02050D66: bl ov18_0223E1A4 bl sub_02031860 mov r0, #0x21 - bl DestroyHeap + bl Heap_Destroy ldr r0, _02050D84 ; =UNK_021C5A6C mov r1, #0x0 ldr r0, [r0, #0x0] diff --git a/arm9/asm/unk_02050E48.s b/arm9/asm/unk_02050E48.s index 3975b4523..bb6eb5c49 100644 --- a/arm9/asm/unk_02050E48.s +++ b/arm9/asm/unk_02050E48.s @@ -24,7 +24,7 @@ sub_02050E48: ; 0x02050E48 str r2, [sp, #0x0] str r3, [sp, #0x4] ldr r6, [r5, #0xc] - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0x0 mov r2, #0x30 add r4, r0, #0x0 @@ -79,7 +79,7 @@ sub_02050ED4: ; 0x02050ED4 add r5, r0, #0x0 add r0, r1, #0x0 mov r1, #0x40 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x0 mov r2, #0x40 add r4, r0, #0x0 @@ -235,7 +235,7 @@ _02051006: add r0, #0x3c strb r1, [r0, #0x0] ldr r0, [r4, #0x4] - bl FreeToHeap + bl Heap_Free mov r0, #0x0 str r0, [r4, #0x4] mov r0, #0x1 @@ -258,7 +258,7 @@ _02051032: add r0, #0x3c strb r1, [r0, #0x0] ldr r0, [r4, #0x0] - bl FreeToHeap + bl Heap_Free mov r0, #0x0 str r0, [r4, #0x0] mov r0, #0x1 @@ -479,7 +479,7 @@ _020511E4: add r0, r4, #0x0 bl sub_02051998 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free add sp, #0x8 mov r0, #0x1 pop {r3-r5, pc} @@ -487,7 +487,7 @@ _020511F6: add r0, r4, #0x0 bl sub_02051998 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free bl sub_0204F7FC add sp, #0x8 mov r0, #0x1 @@ -1295,7 +1295,7 @@ sub_02051880: ; 0x02051880 _0205188E: mov r0, #0xb mov r1, #0x8c - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0x0 mov r1, #0x0 mov r2, #0x8c @@ -1370,11 +1370,11 @@ _02051938: add r6, r0, #0x0 mov r0, #0xb add r1, r6, #0x0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd str r0, [r4, #0x4c] mov r0, #0xb add r1, r6, #0x0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd str r0, [r4, #0x48] mov r0, #0xb bl SaveArray_Party_Alloc @@ -1421,17 +1421,17 @@ sub_02051998: ; 0x02051998 ldr r0, [r4, #0x50] cmp r0, #0x0 beq _020519A6 - bl FreeToHeap + bl Heap_Free _020519A6: ldr r0, [r4, #0x4c] cmp r0, #0x0 beq _020519B0 - bl FreeToHeap + bl Heap_Free _020519B0: ldr r0, [r4, #0x48] cmp r0, #0x0 beq _020519BA - bl FreeToHeap + bl Heap_Free _020519BA: ldr r0, [r4, #0x2c] bl DestroyMsgData @@ -2259,7 +2259,7 @@ _0205200C: _02052028: bl sub_0204F7FC add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x1 pop {r4-r6, pc} _02052036: @@ -2299,7 +2299,7 @@ _02052066: bne _0205209C mov r0, #0xb mov r1, #0x2c - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r2, r0, #0x0 str r4, [r2, #0x24] mov r0, #0x0 diff --git a/arm9/asm/unk_020520AC.s b/arm9/asm/unk_020520AC.s index 3cb670e76..f99278642 100644 --- a/arm9/asm/unk_020520AC.s +++ b/arm9/asm/unk_020520AC.s @@ -137,7 +137,7 @@ _020520C0: mov r0, #0x3 mov r1, #0x1f lsl r2, r2, #0x6 - bl CreateHeapAtEnd + bl Heap_CreateAtEnd add r0, r4, #0x0 bl sub_02052110 add r5, r0, #0x0 @@ -187,7 +187,7 @@ _0205211E: mov r1, #0x19 mov r0, #0x1f lsl r1, r1, #0x4 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x19 mov r1, #0x0 lsl r2, r2, #0x4 @@ -623,9 +623,9 @@ sub_020524A0: ; 0x020524A0 ldr r0, [r4, #0xc] bl SysTask_Destroy add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x1f - bl DestroyHeap + bl Heap_Destroy _020524B8: pop {r4, pc} .balign 4 @@ -1889,7 +1889,7 @@ _02052DBA: str r4, [sp, #0x4] bl BufferString add r0, r6, #0x0 - bl FreeToHeap + bl Heap_Free add r0, r7, #0x0 bl DestroyMsgData _02052DE0: @@ -2003,15 +2003,15 @@ sub_02052EAC: ; 0x02052EAC mov r0, #0x62 lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free mov r0, #0x63 lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free mov r0, #0x61 lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_start sub_02052ED0 diff --git a/arm9/asm/unk_02052EE8.s b/arm9/asm/unk_02052EE8.s index adc3b53db..664defd4b 100644 --- a/arm9/asm/unk_02052EE8.s +++ b/arm9/asm/unk_02052EE8.s @@ -17,7 +17,7 @@ sub_02052EE8: ; 0x02052EE8 ldr r1, _02052F58 ; =0x000004E8 add r5, r0, #0x0 mov r0, #0x1f - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 ldr r2, _02052F58 ; =0x000004E8 mov r0, #0x0 @@ -50,7 +50,7 @@ sub_02052EE8: ; 0x02052EE8 ldr r0, [r0, #0x38] str r0, [r4, #0x8] mov r0, #0xb - bl CreateHeapAtEnd + bl Heap_CreateAtEnd mov r0, #0x59 bl sub_02053618 ldr r1, _02052F6C ; =0x000004DC @@ -113,9 +113,9 @@ sub_02052FA4: ; 0x02052FA4 ldr r0, [r4, r0] bl sub_0205362C mov r0, #0x59 - bl DestroyHeap + bl Heap_Destroy add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .balign 4 _02052FC4: .word 0x000004DC @@ -913,7 +913,7 @@ sub_020535E0: ; 0x020535E0 push {r4, lr} add r4, r0, #0x0 ldr r0, [r4, #0x0] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x4] cmp r0, #0x0 beq _020535F4 @@ -946,7 +946,7 @@ sub_02053618: ; 0x02053618 push {r4, lr} mov r1, #0x35 lsl r1, r1, #0x4 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 bl sub_020535BC add r0, r4, #0x0 @@ -958,5 +958,5 @@ sub_0205362C: ; 0x0205362C add r4, r0, #0x0 bl sub_02053600 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} diff --git a/arm9/asm/unk_0205363C.s b/arm9/asm/unk_0205363C.s index 178973f8c..1b0acc795 100644 --- a/arm9/asm/unk_0205363C.s +++ b/arm9/asm/unk_0205363C.s @@ -170,7 +170,7 @@ sub_02053708: ; 0x02053708 add r4, r0, #0x0 add r0, r5, #0x0 lsl r1, r1, #0x6 - bl AllocFromHeap + bl Heap_Alloc add r5, r0, #0x0 ldr r0, [sp, #0x0] mov r2, #0x0 @@ -187,7 +187,7 @@ _02053734: cmp r2, r0 blt _02053734 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0x0 add sp, #0x4 pop {r3-r6, pc} diff --git a/arm9/asm/unk_02053750.s b/arm9/asm/unk_02053750.s index 09343a092..e0942950a 100644 --- a/arm9/asm/unk_02053750.s +++ b/arm9/asm/unk_02053750.s @@ -989,7 +989,7 @@ _02053E24: bl sub_02008BE0 str r0, [r5, #0x4] add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free add sp, #0x18 pop {r3-r7, pc} nop @@ -1008,7 +1008,7 @@ sub_02053E8C: ; 0x02053E8C bl sub_0200965C add r1, r0, #0x0 mov r0, #0x4 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0x0 mov r0, #0x4 add r1, r6, #0x0 @@ -1018,7 +1018,7 @@ sub_02053E8C: ; 0x02053E8C mov r2, #0x4 bl sub_02009668 add r0, r6, #0x0 - bl FreeToHeap + bl Heap_Free cmp r5, #0x0 beq _02053ED0 add r0, r4, #0x0 @@ -1039,7 +1039,7 @@ _02053ED2: add r0, r4, #0x0 bl sub_020096B4 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0x0 pop {r3-r7, pc} .balign 4 @@ -1253,7 +1253,7 @@ sub_02054088: ; 0x02054088 add r5, r1, #0x0 mov r0, #0x4 mov r1, #0x14 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x0] mov r2, #0x14 mov r1, #0x0 @@ -1291,7 +1291,7 @@ sub_020540C8: ; 0x020540C8 bl sub_0201FFC8 ldr r1, [r4, #0x0] mov r0, #0x4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit mov r0, #0x0 str r0, [r4, #0x0] _020540E4: @@ -1372,7 +1372,7 @@ sub_02054168: ; 0x02054168 add r5, r1, #0x0 mov r0, #0x4 mov r1, #0x14 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x0] mov r2, #0x14 mov r1, #0x0 @@ -1408,7 +1408,7 @@ sub_020541A4: ; 0x020541A4 bl sub_0201FFC8 ldr r1, [r4, #0x0] mov r0, #0x4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit mov r0, #0x0 str r0, [r4, #0x0] _020541C0: @@ -1443,7 +1443,7 @@ sub_020541E8: ; 0x020541E8 add r5, r1, #0x0 mov r0, #0x4 mov r1, #0x14 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x0] mov r2, #0x14 mov r1, #0x0 @@ -1481,7 +1481,7 @@ sub_02054228: ; 0x02054228 bl sub_0201FFC8 ldr r1, [r4, #0x0] mov r0, #0x4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit mov r0, #0x0 str r0, [r4, #0x0] _02054244: @@ -1542,7 +1542,7 @@ sub_020542A4: ; 0x020542A4 add r5, r1, #0x0 mov r0, #0x4 mov r1, #0x18 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x0] mov r2, #0x18 mov r1, #0x0 @@ -1581,7 +1581,7 @@ sub_020542E8: ; 0x020542E8 bl sub_0201FFC8 ldr r1, [r4, #0x0] mov r0, #0x4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit mov r0, #0x0 str r0, [r4, #0x0] _02054304: @@ -1703,7 +1703,7 @@ sub_020543D8: ; 0x020543D8 add r5, r1, #0x0 mov r0, #0x4 mov r1, #0x18 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x0] mov r2, #0x18 mov r1, #0x0 @@ -1749,7 +1749,7 @@ sub_0205442C: ; 0x0205442C bl sub_0201FFC8 ldr r1, [r4, #0x0] mov r0, #0x4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit mov r0, #0x0 str r0, [r4, #0x0] _02054448: @@ -1861,7 +1861,7 @@ sub_02054508: ; 0x02054508 add r5, r1, #0x0 mov r0, #0x4 mov r1, #0x14 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x0] mov r2, #0x14 mov r1, #0x0 @@ -1900,7 +1900,7 @@ sub_0205454C: ; 0x0205454C bl sub_0201FFC8 ldr r1, [r4, #0x0] mov r0, #0x4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit mov r0, #0x0 str r0, [r4, #0x0] _02054568: diff --git a/arm9/asm/unk_02054C14.s b/arm9/asm/unk_02054C14.s index b18e70aee..3bd77f6b7 100644 --- a/arm9/asm/unk_02054C14.s +++ b/arm9/asm/unk_02054C14.s @@ -456,7 +456,7 @@ _02054F28: add r1, sp, #0x0 bl sub_02058BB4 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free add sp, #0xc mov r0, #0x1 pop {r4-r5, pc} @@ -475,7 +475,7 @@ sub_02054F50: ; 0x02054F50 str r0, [sp, #0x0] mov r0, #0xb mov r1, #0x14 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0x0 mov r2, #0x14 add r4, r0, #0x0 @@ -561,7 +561,7 @@ sub_02054FE4: ; 0x02054FE4 cmp r1, #0x0 bne _02055028 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x1 pop {r4, pc} _02055028: @@ -578,7 +578,7 @@ sub_0205502C: ; 0x0205502C str r0, [sp, #0x0] mov r0, #0xb mov r1, #0xc - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0x0 mov r1, #0x0 mov r2, #0xc diff --git a/arm9/asm/unk_0205AD98.s b/arm9/asm/unk_0205AD98.s index 21f098ac0..7e0e869bd 100644 --- a/arm9/asm/unk_0205AD98.s +++ b/arm9/asm/unk_0205AD98.s @@ -157,7 +157,7 @@ sub_0205AEA4: ; 0x0205AEA4 add r6, r1, #0x0 mov r0, #0x4 mov r1, #0x14 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0x0 bne _0205AEBA bl GF_AssertFail @@ -212,7 +212,7 @@ _0205AF14: bl sub_0205AE50 mov r0, #0x4 add r1, r4, #0x0 - bl FreeToHeapExplicit + bl Heap_FreeExplicit add r0, r5, #0x0 bl SysTask_Destroy pop {r3-r5, pc} diff --git a/arm9/asm/unk_0205C598.s b/arm9/asm/unk_0205C598.s index eb85e3cc8..4c127d1d5 100644 --- a/arm9/asm/unk_0205C598.s +++ b/arm9/asm/unk_0205C598.s @@ -675,7 +675,7 @@ sub_0205CA80: ; 0x0205CA80 mov r1, #0x2c add r7, r2, #0x0 str r3, [sp, #0x0] - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0x0 bne _0205CA9A bl GF_AssertFail @@ -723,7 +723,7 @@ sub_0205CAE0: ; 0x0205CAE0 bl sub_0201B6C8 add r1, r0, #0x0 mov r0, #0x4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit add r0, r4, #0x0 bl SysTask_Destroy pop {r4, pc} diff --git a/arm9/asm/unk_0205CE48.s b/arm9/asm/unk_0205CE48.s index 6bfe89c37..12882c7de 100644 --- a/arm9/asm/unk_0205CE48.s +++ b/arm9/asm/unk_0205CE48.s @@ -145,7 +145,7 @@ sub_0205CF10: ; 0x0205CF10 mov r1, #0xc add r6, r2, #0x0 add r7, r3, #0x0 - bl AllocFromHeap + bl Heap_Alloc str r5, [r0, #0x0] strh r4, [r0, #0x4] strh r6, [r0, #0x6] @@ -263,7 +263,7 @@ _0205CFC6: b _0205D020 _0205D016: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x1 pop {r3-r7, pc} _0205D020: @@ -282,7 +282,7 @@ sub_0205D024: ; 0x0205D024 add r7, r0, #0x0 mov r0, #0xb mov r1, #0x40 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x0 mov r2, #0x40 add r4, r0, #0x0 @@ -765,7 +765,7 @@ sub_0205D400: ; 0x0205D400 add r7, r0, #0x0 mov r0, #0xb mov r1, #0x40 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x0 mov r2, #0x40 add r4, r0, #0x0 @@ -989,7 +989,7 @@ sub_0205D5C4: ; 0x0205D5C4 add r5, r0, #0x0 mov r0, #0xb mov r1, #0x4 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0x0 mov r0, #0x0 str r0, [r4, #0x0] @@ -1013,7 +1013,7 @@ sub_0205D604: ; 0x0205D604 add r4, r0, #0x0 mov r0, #0xb mov r1, #0x4 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r2, r0, #0x0 mov r0, #0x0 str r0, [r2, #0x0] @@ -1132,7 +1132,7 @@ sub_0205D6BC: ; 0x0205D6BC str r0, [sp, #0x0] ldr r1, [sp, #0x0] mov r0, #0xb - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd ldr r2, [sp, #0x0] mov r1, #0x0 add r7, r0, #0x0 @@ -1379,7 +1379,7 @@ sub_0205D8B8: ; 0x0205D8B8 add r5, r0, #0x0 mov r0, #0xb mov r1, #0x18 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 mov r0, #0x0 strh r0, [r4, #0x16] @@ -1475,7 +1475,7 @@ _0205D984: ldr r0, [r4, #0x10] bl String_Delete add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x1 pop {r3-r5, pc} _0205D9A0: @@ -1496,7 +1496,7 @@ sub_0205D9A8: ; 0x0205D9A8 add r7, r0, #0x0 mov r0, #0xb mov r1, #0x40 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x0 mov r2, #0x40 add r4, r0, #0x0 @@ -1728,7 +1728,7 @@ _0205DB66: _0205DB9C: mov r0, #0xb mov r1, #0x2c - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 mov r1, #0x0 mov r2, #0x2c @@ -1762,7 +1762,7 @@ _0205DBE0: cmp r5, #0x0 bne _0205DBEA add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free _0205DBEA: mov r0, #0x1 pop {r3-r7, pc} @@ -1776,7 +1776,7 @@ sub_0205DBF0: ; 0x0205DBF0 add r6, r1, #0x0 mov r0, #0xb mov r1, #0x18 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 mov r0, #0x0 strh r0, [r4, #0x16] @@ -1863,7 +1863,7 @@ _0205DC94: bl sub_02087E14 b _0205DCB6 _0205DCB2: - bl FreeToHeap + bl Heap_Free _0205DCB6: add r0, r5, #0x0 bl FieldSystem_LoadFieldOverlay @@ -1891,7 +1891,7 @@ _0205DCE2: ldr r0, [r5, #0x34] bl MapObjectManager_UnpauseAllMovement add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x1 pop {r3-r5, pc} _0205DCFA: diff --git a/arm9/asm/unk_0205DD18.s b/arm9/asm/unk_0205DD18.s index 2474af7b1..d204ebb10 100644 --- a/arm9/asm/unk_0205DD18.s +++ b/arm9/asm/unk_0205DD18.s @@ -13,7 +13,7 @@ UNK_020F7374: ; 0x020F7374 sub_0205DD18: ; 0x0205DD18 push {r4, lr} mov r1, #0xd4 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 mov r0, #0x1 lsl r0, r0, #0x10 @@ -28,10 +28,10 @@ sub_0205DD18: ; 0x0205DD18 thumb_func_start sub_0205DD38 sub_0205DD38: ; 0x0205DD38 - ldr r3, _0205DD3C ; =FreeToHeap + ldr r3, _0205DD3C ; =Heap_Free bx r3 .balign 4 -_0205DD3C: .word FreeToHeap +_0205DD3C: .word Heap_Free thumb_func_start sub_0205DD40 sub_0205DD40: ; 0x0205DD40 @@ -929,7 +929,7 @@ _0205E3CC: str r0, [r5, #0x0] b _0205E3FC _0205E3DE: - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x34] bl MapObjectManager_UnpauseAllMovement mov r0, #0x1 diff --git a/arm9/asm/unk_0205EB38.s b/arm9/asm/unk_0205EB38.s index 60757805b..465a4c0e1 100644 --- a/arm9/asm/unk_0205EB38.s +++ b/arm9/asm/unk_0205EB38.s @@ -36,7 +36,7 @@ sub_0205EB38: ; 0x0205EB38 mov r1, #0x5b add r0, r4, #0x0 lsl r1, r1, #0x2 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x5b add r7, r0, #0x0 mov r1, #0x0 @@ -124,7 +124,7 @@ _0205EC02: add r0, r7, #0x0 bl ov05_021D99F8 add r0, r7, #0x0 - bl FreeToHeap + bl Heap_Free pop {r3-r7, pc} thumb_func_start sub_0205EC18 diff --git a/arm9/asm/unk_0205F7A0.s b/arm9/asm/unk_0205F7A0.s index d3b7a198c..b6f7cb53e 100644 --- a/arm9/asm/unk_0205F7A0.s +++ b/arm9/asm/unk_0205F7A0.s @@ -187,7 +187,7 @@ _0205F8F8: _0205F90A: mov r0, #0xb mov r1, #0x4 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0x0 mov r2, #0x4 add r6, r0, #0x0 @@ -323,7 +323,7 @@ _0205FA16: add r0, sp, #0x28 bl FS_CloseFile add r0, r6, #0x0 - bl FreeToHeap + bl Heap_Free add sp, #0x70 pop {r3-r7, pc} nop diff --git a/arm9/asm/unk_020603B0.s b/arm9/asm/unk_020603B0.s index 53dab7eea..0a733ae8b 100644 --- a/arm9/asm/unk_020603B0.s +++ b/arm9/asm/unk_020603B0.s @@ -294,7 +294,7 @@ _020604D0: mov r1, #0x5 bl sub_0202AAFC ldr r0, [sp, #0x1c] - bl FreeToHeap + bl Heap_Free ldr r0, [sp, #0x14] bl sub_0202AA38 add r2, r0, #0x0 diff --git a/arm9/asm/unk_020606B0.s b/arm9/asm/unk_020606B0.s index e5ce5dd13..068e5c3ac 100644 --- a/arm9/asm/unk_020606B0.s +++ b/arm9/asm/unk_020606B0.s @@ -108,11 +108,11 @@ _02060764: b _0206078A _02060772: ldr r0, [r4, #0x24] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x28] - bl FreeToHeap + bl Heap_Free add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free add sp, #0x8 mov r0, #0x1 pop {r4-r6, pc} @@ -130,7 +130,7 @@ CallTask_NPCTrade: ; 0x02060790 mov r1, #0x2c add r6, r2, #0x0 str r3, [sp, #0x0] - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x0 mov r2, #0x2c add r4, r0, #0x0 diff --git a/arm9/asm/unk_020607D4.s b/arm9/asm/unk_020607D4.s index f17e49bbc..8d1bdcd9d 100644 --- a/arm9/asm/unk_020607D4.s +++ b/arm9/asm/unk_020607D4.s @@ -19,7 +19,7 @@ sub_020607D4: ; 0x020607D4 mov r1, #0x80 add r7, r2, #0x0 str r3, [sp, #0xc] - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0x0 strb r6, [r4, #0x1] strb r7, [r4, #0x4] @@ -151,7 +151,7 @@ _020608F0: _020608F8: bl GF_AssertFail add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free add sp, #0x28 pop {r3-r7, pc} _02060906: @@ -177,7 +177,7 @@ sub_02060924: ; 0x02060924 mov r0, #0xb mov r1, #0x8 add r6, r2, #0x0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r2, r0, #0x0 str r6, [r2, #0x4] strb r4, [r2, #0x0] @@ -222,7 +222,7 @@ _0206097C: pop {r4-r6, pc} _0206098A: add r0, r6, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x1 pop {r4-r6, pc} _02060994: @@ -398,7 +398,7 @@ _02060AE2: strb r0, [r4, #0x0] b _02060B00 _02060AF6: - bl FreeToHeap + bl Heap_Free add sp, #0xc mov r0, #0x1 pop {r3-r6, pc} diff --git a/arm9/asm/unk_02060CCC.s b/arm9/asm/unk_02060CCC.s index cd7fabfb4..26aaea4aa 100644 --- a/arm9/asm/unk_02060CCC.s +++ b/arm9/asm/unk_02060CCC.s @@ -582,7 +582,7 @@ _02061000: sub_02061008: ; 0x02061008 push {r4, lr} mov r1, #0x24 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 mov r0, #0x0 add r1, r4, #0x0 @@ -593,10 +593,10 @@ sub_02061008: ; 0x02061008 thumb_func_start sub_02061020 sub_02061020: ; 0x02061020 - ldr r3, _02061024 ; =FreeToHeap + ldr r3, _02061024 ; =Heap_Free bx r3 .balign 4 -_02061024: .word FreeToHeap +_02061024: .word Heap_Free thumb_func_start sub_02061028 sub_02061028: ; 0x02061028 diff --git a/arm9/asm/unk_020625EC.s b/arm9/asm/unk_020625EC.s index 3d8618bd9..ae383239a 100644 --- a/arm9/asm/unk_020625EC.s +++ b/arm9/asm/unk_020625EC.s @@ -61,11 +61,11 @@ sub_020625EC: ; 0x020625EC mov r1, #0x50 lsl r2, r0, #0xd ldr r6, [r5, #0xc] - bl CreateHeap + bl Heap_Create mov r1, #0x2d mov r0, #0x50 lsl r1, r1, #0x4 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x2d mov r1, #0x0 lsl r2, r2, #0x4 @@ -187,14 +187,14 @@ _020626EC: _020626FE: add r0, r4, #0x0 ldr r5, [r4, #0x0] - bl FreeToHeap + bl Heap_Free mov r2, #0x2d add r0, r4, #0x0 mov r1, #0x0 lsl r2, r2, #0x4 bl MI_CpuFill8 add r0, r5, #0x0 - bl DestroyHeap + bl Heap_Destroy mov r0, #0xc add sp, #0x8 pop {r3-r7, pc} @@ -647,7 +647,7 @@ sub_02062A70: ; 0x02062A70 mov r1, #0x3c ldr r0, [r4, #0x0] mul r1, r2 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0xb lsl r1, r1, #0x6 str r0, [r4, r1] @@ -909,7 +909,7 @@ _02062C72: mov r0, #0xb lsl r0, r0, #0x6 ldr r0, [r6, r0] - bl FreeToHeap + bl Heap_Free pop {r3-r7, pc} .balign 4 @@ -2095,7 +2095,7 @@ _02063636: str r0, [r4, #0x0] b _02063646 _0206363E: - bl FreeToHeap + bl Heap_Free mov r0, #0x1 pop {r3-r5, pc} _02063646: @@ -2112,7 +2112,7 @@ sub_02063650: ; 0x02063650 add r4, r0, #0x0 mov r0, #0xb mov r1, #0xc - bl AllocFromHeap + bl Heap_Alloc add r2, r0, #0x0 mov r0, #0x0 str r0, [r2, #0x0] diff --git a/arm9/asm/unk_02063888.s b/arm9/asm/unk_02063888.s index 17ccd059d..fa1784253 100644 --- a/arm9/asm/unk_02063888.s +++ b/arm9/asm/unk_02063888.s @@ -10,7 +10,7 @@ sub_02063888: ; 0x02063888 mov r1, #0x18 add r4, r2, #0x0 add r6, r3, #0x0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r3, r0, #0x0 mov r2, #0x18 mov r1, #0x0 @@ -92,7 +92,7 @@ _02063920: sub r2, r2, #0x2 bl sub_020492BC add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free _02063942: mov r0, #0x0 add sp, #0x1c diff --git a/arm9/asm/unk_020643C0.s b/arm9/asm/unk_020643C0.s index 61e06c2df..eea3ac4fb 100644 --- a/arm9/asm/unk_020643C0.s +++ b/arm9/asm/unk_020643C0.s @@ -273,7 +273,7 @@ _020645D8: .word sub_020646DC sub_020645DC: ; 0x020645DC push {r4, lr} mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 bne _020645EC bl GF_AssertFail @@ -292,12 +292,12 @@ _020645F2: thumb_func_start sub_02064600 sub_02064600: ; 0x02064600 - ldr r3, _02064608 ; =FreeToHeapExplicit + ldr r3, _02064608 ; =Heap_FreeExplicit add r1, r0, #0x0 ldr r0, [r1, #0x8] bx r3 .balign 4 -_02064608: .word FreeToHeapExplicit +_02064608: .word Heap_FreeExplicit thumb_func_start sub_0206460C sub_0206460C: ; 0x0206460C @@ -306,7 +306,7 @@ sub_0206460C: ; 0x0206460C add r5, r1, #0x0 mul r5, r2 add r1, r5, #0x0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 bne _02064622 bl GF_AssertFail @@ -320,13 +320,13 @@ _02064622: thumb_func_start sub_02064630 sub_02064630: ; 0x02064630 - ldr r3, _0206463C ; =FreeToHeapExplicit + ldr r3, _0206463C ; =Heap_FreeExplicit add r1, r0, #0x0 ldr r0, [r1, #0x8] ldr r1, [r1, #0xc] bx r3 nop -_0206463C: .word FreeToHeapExplicit +_0206463C: .word Heap_FreeExplicit thumb_func_start sub_02064640 sub_02064640: ; 0x02064640 diff --git a/arm9/asm/unk_020647A4.s b/arm9/asm/unk_020647A4.s index ede2ffa75..f5120182a 100644 --- a/arm9/asm/unk_020647A4.s +++ b/arm9/asm/unk_020647A4.s @@ -365,7 +365,7 @@ sub_020649D4: ; 0x020649D4 _020649FE: mov r0, #0xb mov r1, #0x10 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r2, r0, #0x0 mov r0, #0x0 str r0, [r2, #0x0] @@ -525,7 +525,7 @@ _02064B2E: str r0, [r4, #0x0] b _02064B5C _02064B52: - bl FreeToHeap + bl Heap_Free add sp, #0x1c mov r0, #0x1 pop {r4-r5, pc} @@ -642,7 +642,7 @@ _02064C24: str r0, [r4, #0x0] b _02064C52 _02064C48: - bl FreeToHeap + bl Heap_Free add sp, #0x1c mov r0, #0x1 pop {r4-r5, pc} diff --git a/arm9/asm/unk_02064E90.s b/arm9/asm/unk_02064E90.s index 660ac0e33..ca51fddf8 100644 --- a/arm9/asm/unk_02064E90.s +++ b/arm9/asm/unk_02064E90.s @@ -198,7 +198,7 @@ _02065050: .word 0x00000668 sub_02065054: ; 0x02065054 push {r4, lr} ldr r1, _0206506C ; =0x0000066C - bl AllocFromHeap + bl Heap_Alloc ldr r2, _0206506C ; =0x0000066C mov r1, #0x0 add r4, r0, #0x0 @@ -210,10 +210,10 @@ _0206506C: .word 0x0000066C thumb_func_start sub_02065070 sub_02065070: ; 0x02065070 - ldr r3, _02065074 ; =FreeToHeap + ldr r3, _02065074 ; =Heap_Free bx r3 .balign 4 -_02065074: .word FreeToHeap +_02065074: .word Heap_Free thumb_func_start GetTrainerCardLevel GetTrainerCardLevel: ; 0x02065078 @@ -587,7 +587,7 @@ sub_02065344: ; 0x02065344 add r5, r0, #0x0 mov r0, #0xb mov r1, #0x8 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0x0 mov r0, #0x0 str r0, [r4, #0x0] @@ -656,7 +656,7 @@ _020653C8: ldr r0, [r4, #0x78] bl sub_02052EAC add r0, r5, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x1 pop {r3-r5, pc} _020653E2: diff --git a/arm9/asm/unk_020653EC.s b/arm9/asm/unk_020653EC.s index 85a710a74..7b072b447 100644 --- a/arm9/asm/unk_020653EC.s +++ b/arm9/asm/unk_020653EC.s @@ -43,11 +43,11 @@ sub_020653EC: ; 0x020653EC mov r0, #0x3 mov r1, #0x2b lsl r2, r2, #0xc - bl CreateHeap + bl Heap_Create mov r1, #0x6e mov r0, #0x2b lsl r1, r1, #0x2 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x6e mov r1, #0x0 lsl r2, r2, #0x2 @@ -109,9 +109,9 @@ sub_02065474: ; 0x02065474 mov r1, #0x14 bl sub_02066044 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x0] - bl DestroyHeap + bl Heap_Destroy pop {r4, pc} .balign 4 @@ -666,7 +666,7 @@ _020658E2: add r1, r0, #0x0 add r1, #0x22 ldrb r5, [r1, #0x0] - bl FreeToHeap + bl Heap_Free cmp r5, #0x7 bne _02065912 ldr r1, [r4, #0xc] @@ -832,7 +832,7 @@ _02065A24: add r1, r0, #0x0 add r1, #0x23 ldrb r6, [r1, #0x0] - bl FreeToHeap + bl Heap_Free cmp r6, #0x6 bne _02065A4E cmp r5, #0x7 @@ -877,7 +877,7 @@ _02065A86: mov r0, #0x6d lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free ldr r2, _02065AE8 ; =0x0000013B ldrb r1, [r4, #0x17] ldrb r2, [r4, r2] @@ -1707,7 +1707,7 @@ _02066134: add r0, r6, r0 strb r2, [r0, #0x1e] add r0, r7, #0x0 - bl FreeToHeap + bl Heap_Free add sp, #0x14 pop {r4-r7, pc} @@ -2368,7 +2368,7 @@ sub_02066664: ; 0x02066664 _02066676: ldr r0, [r5, #0x0] mov r1, #0x40 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x0 mov r2, #0x40 add r4, r0, #0x0 @@ -2567,7 +2567,7 @@ _02066802: mov r0, #0x0 pop {r3-r5, pc} _0206680C: - bl FreeToHeap + bl Heap_Free mov r0, #0x1 pop {r3-r5, pc} _02066814: @@ -2581,7 +2581,7 @@ sub_02066818: ; 0x02066818 add r4, r0, #0x0 mov r0, #0xb mov r1, #0x8 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r2, r0, #0x0 mov r0, #0x0 str r0, [r2, #0x0] diff --git a/arm9/asm/unk_0206BF90.s b/arm9/asm/unk_0206BF90.s index b3e08dd4d..ba526e2d4 100644 --- a/arm9/asm/unk_0206BF90.s +++ b/arm9/asm/unk_0206BF90.s @@ -23,11 +23,11 @@ sub_0206BF90: ; 0x0206BF90 add r5, r0, #0x0 mov r0, #0x5 mov r1, #0x8 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 mov r0, #0x5 mov r1, #0x8 - bl AllocFromHeap + bl Heap_Alloc add r6, r0, #0x0 ldr r0, _0206BFE4 ; =UNK_020F828C mov r1, #0xc @@ -223,7 +223,7 @@ sub_0206C0C8: ; 0x0206C0C8 mov r1, #0x4 str r2, [sp, #0x8] add r7, r3, #0x0 - bl AllocFromHeap + bl Heap_Alloc add r6, r0, #0x0 ldr r0, [sp, #0x0] bl ov11_022300D4 @@ -281,7 +281,7 @@ _0206C138: blt _0206C138 _0206C14A: add r0, r6, #0x0 - bl FreeToHeap + bl Heap_Free add sp, #0xc pop {r4-r7, pc} @@ -644,7 +644,7 @@ _0206C3C4: _0206C3DE: add r0, r6, #0x0 add r1, r7, #0x0 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x10] add r4, r4, #0x1 add r5, r5, #0x4 @@ -905,7 +905,7 @@ _0206C5A4: pop {r3-r7, pc} _0206C5CC: add r0, r5, #0x0 - bl FreeToHeap + bl Heap_Free ldr r0, [sp, #0x0] bl SysTask_Destroy _0206C5D8: @@ -962,7 +962,7 @@ _0206C61E: pop {r3-r7, pc} _0206C63E: add r0, r5, #0x0 - bl FreeToHeap + bl Heap_Free ldr r0, [sp, #0x0] bl SysTask_Destroy _0206C64A: diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s index 3e68fc398..c94647d95 100644 --- a/arm9/asm/unk_0206C700.s +++ b/arm9/asm/unk_0206C700.s @@ -51,7 +51,7 @@ sub_0206C700: ; 0x0206C700 mov r1, #0x80 add r7, r2, #0x0 str r3, [sp, #0x18] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 mov r0, #0x0 add r1, r4, #0x0 @@ -186,7 +186,7 @@ sub_0206C700: ; 0x0206C700 str r0, [r4, #0x10] add r0, r5, #0x0 mov r1, #0x30 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #0x3c] ldr r1, [r4, #0x3c] mov r0, #0x0 @@ -325,15 +325,15 @@ sub_0206C92C: ; 0x0206C92C ldr r0, [r4, #0xc] bl MessageFormat_Delete ldr r0, [r4, #0x10] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x3c] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x58] bl sub_020143D0 ldr r0, [r4, #0x0] - bl FreeToHeap + bl Heap_Free add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x0 bl TextFlags_SetCanABSpeedUpPrint pop {r4, pc} @@ -738,7 +738,7 @@ _0206CCCE: mov r3, #0x4 bl sub_02007E68 ldr r0, [r4, #0x5c] - bl GF_ExpHeap_FndGetTotalFreeSize + bl HeapExp_FndGetTotalFreeSize mov r1, #0x2 lsl r1, r1, #0xe cmp r0, r1 @@ -2176,7 +2176,7 @@ _0206D8EA: add r2, r6, #0x0 bl SetMonData add r0, r6, #0x0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0x0 mov r1, #0xa1 add r2, sp, #0x0 @@ -2211,7 +2211,7 @@ _0206D8EA: ldr r0, [r4, #0x54] bl Save_Poketch_PokemonHistoryAddMon add r0, r5, #0x0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x4c] ldr r3, [r4, #0x5c] mov r1, #0x4 @@ -2589,7 +2589,7 @@ sub_0206DC80: ; 0x0206DC80 mov r2, #0x2 bl sub_02068B68 add r0, r5, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x0 str r0, [sp, #0x0] str r0, [sp, #0x4] @@ -2670,7 +2670,7 @@ sub_0206DD6C: ; 0x0206DD6C add r2, r5, #0x0 bl StringExpandPlaceholders add r0, r5, #0x0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x4] mov r1, #0xff bl FillWindowPixelBuffer diff --git a/arm9/asm/unk_0206DE24.s b/arm9/asm/unk_0206DE24.s index 0fdc25845..8b576b940 100644 --- a/arm9/asm/unk_0206DE24.s +++ b/arm9/asm/unk_0206DE24.s @@ -210,7 +210,7 @@ sub_0206DFB4: ; 0x0206DFB4 mov r1, #0x12 lsl r1, r1, #0xa add r4, r0, #0x0 - bl AllocFromHeap + bl Heap_Alloc add r2, r0, #0x0 mov r0, #0x1 str r0, [sp, #0x0] @@ -266,7 +266,7 @@ sub_0206E024: ; 0x0206E024 add r0, r5, #0x0 bl sub_02012DE4 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r3-r5, pc} thumb_func_start sub_0206E03C @@ -310,7 +310,7 @@ sub_0206E07C: ; 0x0206E07C add r5, r0, #0x0 ldr r0, [r5, #0x0] mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 bne _0206E090 bl GF_AssertFail @@ -363,6 +363,6 @@ sub_0206E0DC: ; 0x0206E0DC ldr r0, [r4, #0xc] bl sub_0206E024 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .balign 4 diff --git a/arm9/asm/unk_0206F1F0.s b/arm9/asm/unk_0206F1F0.s index 8feb23501..ec71c581b 100644 --- a/arm9/asm/unk_0206F1F0.s +++ b/arm9/asm/unk_0206F1F0.s @@ -203,7 +203,7 @@ _0206F34A: ldr r2, _0206F388 ; =0x00040100 mov r0, #0x3 mov r1, #0x36 - bl CreateHeap + bl Heap_Create bl sub_02088878 ; Loads overlay 13 mov r0, #0x36 bl ov13_02211E60 @@ -212,9 +212,9 @@ _0206F34A: b _0206F380 _0206F366: ldr r0, [r4, #0x0] - bl FreeToHeap + bl Heap_Free add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x4] add r0, r0, #0x1 str r0, [r4, #0x4] @@ -235,14 +235,14 @@ sub_0206F38C: ; 0x0206F38C push {r4, lr} mov r0, #0xb mov r1, #0x10 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0x0 mov r2, #0x10 add r4, r0, #0x0 bl MI_CpuFill8 mov r0, #0xb mov r1, #0xc - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0x0 mov r2, #0xc str r0, [r4, #0x0] diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s index 685ccf73e..e8e821e02 100644 --- a/arm9/asm/unk_0206F3FC.s +++ b/arm9/asm/unk_0206F3FC.s @@ -148,7 +148,7 @@ sub_0206F3FC: ; 0x0206F3FC mov r0, #0x3 mov r1, #0xc lsl r2, r2, #0x10 - bl CreateHeap + bl Heap_Create add r0, r4, #0x0 bl sub_0206FE74 add r4, r0, #0x0 @@ -1022,7 +1022,7 @@ _0206FB30: ldr r0, [sp, #0x0] bl OverlayManager_FreeData mov r0, #0xc - bl DestroyHeap + bl Heap_Destroy mov r0, #0x1 pop {r3-r7, pc} .balign 4 @@ -1237,7 +1237,7 @@ sub_0206FCD4: ; 0x0206FCD4 bl FreeBgTilemapBuffer mov r0, #0xc add r1, r4, #0x0 - bl FreeToHeapExplicit + bl Heap_FreeExplicit pop {r4, pc} .balign 4 @@ -1293,7 +1293,7 @@ sub_0206FD24: ; 0x0206FD24 bl memcpy mov r0, #0xc add r1, r4, #0x0 - bl FreeToHeapExplicit + bl Heap_FreeExplicit mov r1, #0x1a mov r0, #0x0 lsl r1, r1, #0x4 @@ -3668,7 +3668,7 @@ sub_020710C4: ; 0x020710C4 bl ClearFrameAndWindow2 mov r0, #0xc mov r1, #0x8 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 ldr r0, _02071174 ; =0x000005A4 ldr r0, [r5, r0] @@ -3729,7 +3729,7 @@ _02071146: bl sub_02072844 mov r0, #0xc add r1, r4, #0x0 - bl FreeToHeapExplicit + bl Heap_FreeExplicit add r0, r5, #0x0 bl sub_0207295C mov r1, #0x0 @@ -5373,7 +5373,7 @@ sub_02071DF4: ; 0x02071DF4 beq _02071E30 _02071E1E: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0x0 mov r1, #0x0 bl sub_0207703C @@ -5391,7 +5391,7 @@ _02071E30: cmp r0, #0x0 bne _02071E5A add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0x0 mov r1, #0x1 bl sub_0207703C @@ -5399,7 +5399,7 @@ _02071E30: pop {r3-r5, pc} _02071E5A: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free ldr r0, _02071F1C ; =0x000005A4 ldr r2, _02071F20 ; =0x00000B25 ldr r1, [r5, r0] @@ -6241,7 +6241,7 @@ _020724FE: cmp r4, #0x6 blo _020724FE ldr r0, [sp, #0x8] - bl FreeToHeap + bl Heap_Free add sp, #0x10 pop {r3-r7, pc} .balign 4 diff --git a/arm9/asm/unk_02073DA8.s b/arm9/asm/unk_02073DA8.s index 59b30d020..7b8cd8913 100644 --- a/arm9/asm/unk_02073DA8.s +++ b/arm9/asm/unk_02073DA8.s @@ -1610,7 +1610,7 @@ sub_02074AF4: ; 0x02074AF4 mov r1, #0x2c add r4, r5, r0 mov r0, #0xc - bl AllocFromHeap + bl Heap_Alloc add r7, r0, #0x0 mov r0, #0x3 lsl r0, r0, #0x8 @@ -1672,7 +1672,7 @@ _02074B6A: add r1, r7, #0x0 str r0, [r3, #0x0] mov r0, #0xc - bl FreeToHeapExplicit + bl Heap_FreeExplicit mov r1, #0x3 lsl r1, r1, #0x8 ldrb r3, [r4, r1] diff --git a/arm9/asm/unk_0207550C.s b/arm9/asm/unk_0207550C.s index 05a06dc0f..fb2ee1a5e 100644 --- a/arm9/asm/unk_0207550C.s +++ b/arm9/asm/unk_0207550C.s @@ -17,7 +17,7 @@ sub_0207550C: ; 0x0207550C cmp r0, #0x1 beq _0207552C add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x1c pop {r3-r5, pc} _0207552C: @@ -58,7 +58,7 @@ _0207552C: beq _0207558A _02075580: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x0 pop {r3-r5, pc} _0207558A: @@ -68,7 +68,7 @@ _0207558A: cmp r0, #0x0 beq _020755A0 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x1 pop {r3-r5, pc} _020755A0: @@ -78,7 +78,7 @@ _020755A0: cmp r0, #0x0 beq _020755B6 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x2 pop {r3-r5, pc} _020755B6: @@ -143,32 +143,32 @@ _0207562C: b _0207568E _02075632: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x3 pop {r3-r5, pc} _0207563C: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x4 pop {r3-r5, pc} _02075646: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x5 pop {r3-r5, pc} _02075650: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x6 pop {r3-r5, pc} _0207565A: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x7 pop {r3-r5, pc} _02075664: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x8 pop {r3-r5, pc} _0207566E: @@ -178,12 +178,12 @@ _0207566E: cmp r0, #0x0 beq _02075684 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0xb pop {r3-r5, pc} _02075684: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x9 pop {r3-r5, pc} _0207568E: @@ -193,7 +193,7 @@ _0207568E: cmp r0, #0x0 beq _020756A4 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0xa pop {r3-r5, pc} _020756A4: @@ -203,7 +203,7 @@ _020756A4: cmp r0, #0x0 beq _020756BA add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0xb pop {r3-r5, pc} _020756BA: @@ -213,13 +213,13 @@ _020756BA: cmp r0, #0x0 ble _020756D0 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0xc pop {r3-r5, pc} _020756D0: bge _020756DC add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x12 pop {r3-r5, pc} _020756DC: @@ -229,13 +229,13 @@ _020756DC: cmp r0, #0x0 ble _020756F2 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0xd pop {r3-r5, pc} _020756F2: bge _020756FE add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x13 pop {r3-r5, pc} _020756FE: @@ -245,13 +245,13 @@ _020756FE: cmp r0, #0x0 ble _02075714 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0xe pop {r3-r5, pc} _02075714: bge _02075720 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x14 pop {r3-r5, pc} _02075720: @@ -261,13 +261,13 @@ _02075720: cmp r0, #0x0 ble _02075736 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0xf pop {r3-r5, pc} _02075736: bge _02075742 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x15 pop {r3-r5, pc} _02075742: @@ -277,13 +277,13 @@ _02075742: cmp r0, #0x0 ble _02075758 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x10 pop {r3-r5, pc} _02075758: bge _02075764 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x16 pop {r3-r5, pc} _02075764: @@ -293,13 +293,13 @@ _02075764: cmp r0, #0x0 ble _0207577A add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x11 pop {r3-r5, pc} _0207577A: bge _02075786 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x17 pop {r3-r5, pc} _02075786: @@ -309,7 +309,7 @@ _02075786: cmp r0, #0x0 beq _0207579C add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x18 pop {r3-r5, pc} _0207579C: @@ -319,7 +319,7 @@ _0207579C: cmp r0, #0x0 beq _020757B2 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x19 pop {r3-r5, pc} _020757B2: @@ -329,7 +329,7 @@ _020757B2: cmp r0, #0x0 beq _020757C8 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x1a pop {r3-r5, pc} _020757C8: @@ -345,12 +345,12 @@ _020757C8: beq _020757EA _020757E0: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x1b pop {r3-r5, pc} _020757EA: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x1c pop {r3-r5, pc} diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s index 570a33a18..08e7fce76 100644 --- a/arm9/asm/unk_020772F0.s +++ b/arm9/asm/unk_020772F0.s @@ -730,7 +730,7 @@ _020772FE: mov r0, #0x3 mov r1, #0x12 lsl r2, r2, #0xe - bl CreateHeap + bl Heap_Create mov r1, #0x5d add r0, r6, #0x0 lsl r1, r1, #0x4 @@ -1418,7 +1418,7 @@ sub_02077894: ; 0x02077894 mov r2, #0x5 bl CreateMon add r0, r6, #0x0 - bl FreeToHeap + bl Heap_Free _020778DE: mov r1, #0x56 lsl r1, r1, #0x2 @@ -1509,18 +1509,18 @@ _02077982: ldr r1, _02077A70 ; =0x000004AC mov r0, #0x12 ldr r1, [r4, r1] - bl FreeToHeapExplicit + bl Heap_FreeExplicit ldr r0, [r4, #0x0] cmp r0, #0x1 bne _020779C2 ldr r1, _02077A74 ; =0x000004B4 mov r0, #0x12 ldr r1, [r4, r1] - bl FreeToHeapExplicit + bl Heap_FreeExplicit ldr r1, _02077A78 ; =0x000004BC mov r0, #0x12 ldr r1, [r4, r1] - bl FreeToHeapExplicit + bl Heap_FreeExplicit _020779C2: mov r0, #0x16 lsl r0, r0, #0x4 @@ -1583,7 +1583,7 @@ _02077A0C: add r1, r0, #0x0 bl Main_SetVBlankIntrCB mov r0, #0x12 - bl DestroyHeap + bl Heap_Destroy ldr r0, _02077A80 ; =gSystem + 0x60 mov r1, #0x0 strb r1, [r0, #0x5] @@ -1607,7 +1607,7 @@ sub_02077A84: ; 0x02077A84 str r0, [sp, #0x0] add r7, r2, #0x0 add r5, r3, #0x0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 str r6, [r4, #0x0] str r7, [r4, #0x4] @@ -1648,7 +1648,7 @@ _02077ADA: ldr r0, [r4, #0x18] bl String_Delete add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_start sub_02077AE8 @@ -1997,7 +1997,7 @@ _02077D88: mov r1, #0x0 bl BufferBoxMonSpeciesName add r0, r5, #0x0 - bl FreeToHeap + bl Heap_Free _02077DCE: ldr r0, [r7, #0x44] cmp r0, #0x0 @@ -2177,7 +2177,7 @@ _02077F1A: mov r1, #0x0 bl BufferBoxMonSpeciesName add r0, r6, #0x0 - bl FreeToHeap + bl Heap_Free b _02077F7E _02077F50: mov r1, #0x56 @@ -2250,7 +2250,7 @@ _02077FB0: bl FreeBgTilemapBuffer mov r0, #0x12 add r1, r6, #0x0 - bl FreeToHeapExplicit + bl Heap_FreeExplicit pop {r4-r6, pc} thumb_func_start sub_02077FE8 diff --git a/arm9/asm/unk_020799E8.s b/arm9/asm/unk_020799E8.s index a73585a6e..1bb20287c 100644 --- a/arm9/asm/unk_020799E8.s +++ b/arm9/asm/unk_020799E8.s @@ -247,7 +247,7 @@ sub_02079B60: ; 0x02079B60 bl GetNarcMemberSizeByIdPair add r1, r0, #0x0 add r0, r7, #0x0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r7, r0, #0x0 ldr r0, [sp, #0x4] ldr r1, [sp, #0x28] @@ -340,7 +340,7 @@ _02079C24: bl BG_LoadPlttData _02079C36: add r0, r7, #0x0 - bl FreeToHeap + bl Heap_Free add sp, #0x14 pop {r4-r7, pc} @@ -355,7 +355,7 @@ sub_02079C40: ; 0x02079C40 bl GetNarcMemberSizeByIdPair add r1, r0, #0x0 ldr r0, [sp, #0x18] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 add r0, r6, #0x0 add r1, r5, #0x0 diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s index d0f0334ff..ba24bf622 100644 --- a/arm9/asm/unk_02079C70.s +++ b/arm9/asm/unk_02079C70.s @@ -92,7 +92,7 @@ sub_02079C7C: ; 0x02079C7C mov r0, #0x3 mov r1, #0x13 lsl r2, r2, #0x12 - bl CreateHeap + bl Heap_Create ldr r1, _02079DAC ; =0x0000069C add r0, r4, #0x0 mov r2, #0x13 @@ -339,7 +339,7 @@ sub_02079ECC: ; 0x02079ECC add r0, r4, #0x0 bl OverlayManager_FreeData mov r0, #0x13 - bl DestroyHeap + bl Heap_Destroy mov r0, #0x1 pop {r3-r5, pc} .balign 4 @@ -533,7 +533,7 @@ sub_0207A08C: ; 0x0207A08C bl FreeBgTilemapBuffer mov r0, #0x13 add r1, r4, #0x0 - bl FreeToHeapExplicit + bl Heap_FreeExplicit pop {r4, pc} .balign 4 @@ -1649,7 +1649,7 @@ _0207A980: cmp r0, #0x2 bne _0207A99E add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free _0207A99E: mov r1, #0x7 mov r0, #0x0 @@ -1831,7 +1831,7 @@ sub_0207AAE0: ; 0x0207AAE0 add r2, r7, #0x0 bl sub_0207AB0C add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r3-r7, pc} .balign 4 @@ -2765,7 +2765,7 @@ _0207B256: mov r1, #0x3 bl ScheduleBgTilemapBufferTransfer add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free ldr r0, _0207B2AC ; =0x0000068C ldrsb r0, [r5, r0] cmp r0, #0x0 diff --git a/arm9/asm/unk_0207D5BC.s b/arm9/asm/unk_0207D5BC.s index 57a53e10e..39f2d3d35 100644 --- a/arm9/asm/unk_0207D5BC.s +++ b/arm9/asm/unk_0207D5BC.s @@ -1548,7 +1548,7 @@ sub_0207E190: ; 0x0207E190 add r2, r7, #0x0 bl sub_0207E0C4 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free b _0207E1F4 _0207E1E8: sub r0, #0x8 diff --git a/arm9/asm/unk_0207FD00.s b/arm9/asm/unk_0207FD00.s index 9bd846387..658396948 100644 --- a/arm9/asm/unk_0207FD00.s +++ b/arm9/asm/unk_0207FD00.s @@ -24,7 +24,7 @@ sub_0207FD00: ; 0x0207FD00 add r6, r1, #0x0 add r0, r7, #0x0 mov r1, #0x3c - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 mov r2, #0x65 str r7, [r4, #0x0] @@ -436,34 +436,34 @@ sub_02080094: ; 0x02080094 ldr r0, [r4, #0x18] cmp r0, #0x0 beq _020800A2 - bl FreeToHeap + bl Heap_Free _020800A2: ldr r0, [r4, #0x20] cmp r0, #0x0 beq _020800AC - bl FreeToHeap + bl Heap_Free _020800AC: ldr r0, [r4, #0x28] cmp r0, #0x0 beq _020800B6 - bl FreeToHeap + bl Heap_Free _020800B6: ldr r0, [r4, #0x30] cmp r0, #0x0 beq _020800C0 - bl FreeToHeap + bl Heap_Free _020800C0: ldr r0, [r4, #0x38] cmp r0, #0x0 beq _020800CA - bl FreeToHeap + bl Heap_Free _020800CA: ldr r0, [r4, #0x8] bl MessageFormat_Delete ldr r0, [r4, #0x4] bl DestroyMsgData add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .balign 4 diff --git a/arm9/asm/unk_02080C38.s b/arm9/asm/unk_02080C38.s index a244fac37..4423ec8fb 100644 --- a/arm9/asm/unk_02080C38.s +++ b/arm9/asm/unk_02080C38.s @@ -47,7 +47,7 @@ sub_02080C38: ; 0x02080C38 add r5, r0, #0x0 mov r0, #0xb mov r1, #0x8 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0x0 mov r2, #0x8 add r4, r0, #0x0 @@ -249,7 +249,7 @@ _02080DE2: bl GF_AssertFail _02080DE6: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free add sp, #0x28 mov r0, #0x1 pop {r3-r7, pc} @@ -271,7 +271,7 @@ sub_02080E0C: ; 0x02080E0C add r6, r1, #0x0 mov r0, #0xb mov r1, #0x8 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0x0 mov r2, #0x8 add r4, r0, #0x0 @@ -500,7 +500,7 @@ _02080FCE: bl GF_AssertFail _02080FD2: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x1 pop {r3-r5, pc} _02080FDC: @@ -750,7 +750,7 @@ _020811A4: bl GF_AssertFail _020811A8: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free add sp, #0x10 mov r0, #0x1 pop {r3-r7, pc} @@ -772,7 +772,7 @@ sub_020811D8: ; 0x020811D8 push {r4, lr} ldr r1, _02081204 ; =0x000019C4 mov r0, #0x14 - bl AllocFromHeap + bl Heap_Alloc ldr r2, _02081204 ; =0x000019C4 mov r1, #0x0 add r4, r0, #0x0 @@ -794,10 +794,10 @@ _02081208: .word 0x00000123 thumb_func_start sub_0208120C sub_0208120C: ; 0x0208120C - ldr r3, _02081210 ; =FreeToHeap + ldr r3, _02081210 ; =Heap_Free bx r3 .balign 4 -_02081210: .word FreeToHeap +_02081210: .word Heap_Free thumb_func_start sub_02081214 sub_02081214: ; 0x02081214 @@ -807,7 +807,7 @@ sub_02081214: ; 0x02081214 mov r0, #0xb mov r1, #0x14 lsl r2, r2, #0xe - bl CreateHeap + bl Heap_Create bl sub_020811D8 add r4, r0, #0x0 bl GetLCRNGSeed @@ -1162,14 +1162,14 @@ sub_020814E8: ; 0x020814E8 mov r0, #0x56 lsl r0, r0, #0x2 ldr r0, [r7, r0] - bl FreeToHeap + bl Heap_Free mov r6, #0x57 mov r4, #0x0 add r5, r7, #0x0 lsl r6, r6, #0x2 _020814FE: ldr r0, [r5, #0x0] - bl FreeToHeap + bl Heap_Free add r0, r5, #0x0 add r0, #0xe8 ldr r0, [r0, #0x0] @@ -1177,9 +1177,9 @@ _020814FE: add r0, r5, #0x0 add r0, #0xf8 ldr r0, [r0, #0x0] - bl FreeToHeap + bl Heap_Free ldr r0, [r5, r6] - bl FreeToHeap + bl Heap_Free add r4, r4, #0x1 add r5, r5, #0x4 cmp r4, #0x4 @@ -1191,7 +1191,7 @@ _020814FE: add r0, r7, #0x0 bl sub_0208120C mov r0, #0x14 - bl DestroyHeap + bl Heap_Destroy pop {r3-r7, pc} .balign 4 @@ -1287,7 +1287,7 @@ sub_020815D0: ; 0x020815D0 bl sub_02027740 mov r0, #0x14 mov r1, #0x28 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x0 mov r2, #0x28 add r4, r0, #0x0 @@ -1354,7 +1354,7 @@ sub_02081668: ; 0x02081668 add r4, r0, #0x0 ldr r0, _0208167C ; =0x000019B8 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free ldr r0, _0208167C ; =0x000019B8 mov r1, #0x0 str r1, [r4, r0] @@ -3262,7 +3262,7 @@ sub_02082444: ; 0x02082444 _02082456: mov r0, #0x4 mov r1, #0x10 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0x0 mov r2, #0x10 add r4, r0, #0x0 @@ -3413,7 +3413,7 @@ sub_0208251C: ; 0x0208251C _02082580: ldr r0, _02082598 ; =0x000019BC ldr r0, [r5, r0] - bl FreeToHeap + bl Heap_Free ldr r0, _02082598 ; =0x000019BC mov r1, #0x0 str r1, [r5, r0] diff --git a/arm9/asm/unk_020828BC.s b/arm9/asm/unk_020828BC.s index 79fb72b0e..83a5acb8c 100644 --- a/arm9/asm/unk_020828BC.s +++ b/arm9/asm/unk_020828BC.s @@ -188,7 +188,7 @@ _0208292A: ldr r1, [sp, #0x24] add r0, r5, #0x0 add r1, r1, #0x1 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r5, r0, #0x0 ldr r0, [sp, #0x78] cmp r0, #0x1 @@ -495,9 +495,9 @@ _02082B6A: blt _02082B5A _02082B7E: add r0, r5, #0x0 - bl FreeToHeap + bl Heap_Free ldr r0, [sp, #0x14] - bl FreeToHeap + bl Heap_Free add sp, #0x58 pop {r3-r7, pc} .balign 4 @@ -708,7 +708,7 @@ _02082CD2: b _02082BE0 _02082D06: ldr r0, [sp, #0x14] - bl FreeToHeap + bl Heap_Free add sp, #0x18 pop {r3-r7, pc} .balign 4 @@ -948,12 +948,12 @@ sub_02082ED0: ; 0x02082ED0 ldr r1, [sp, #0x18] ldr r0, [sp, #0x8] add r1, r1, #0x1 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd ldr r1, [sp, #0x18] add r6, r0, #0x0 ldr r0, [sp, #0x8] add r1, r1, #0x1 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd str r0, [sp, #0x10] ldr r0, [sp, #0x18] add r2, r5, #0x0 @@ -1208,11 +1208,11 @@ _02083058: str r0, [sp, #0x4] strh r1, [r0, #0x0] ldr r0, [sp, #0x10] - bl FreeToHeap + bl Heap_Free add r0, r6, #0x0 - bl FreeToHeap + bl Heap_Free ldr r0, [sp, #0x14] - bl FreeToHeap + bl Heap_Free add sp, #0x24 pop {r4-r7, pc} .balign 4 diff --git a/arm9/asm/unk_020834D0.s b/arm9/asm/unk_020834D0.s index a8646b1ef..db1e9b019 100644 --- a/arm9/asm/unk_020834D0.s +++ b/arm9/asm/unk_020834D0.s @@ -308,7 +308,7 @@ sub_020836BC: ; 0x020836BC add r4, r0, #0x0 mov r0, #0x14 add r1, r4, #0x1 - bl AllocFromHeap + bl Heap_Alloc add r5, r0, #0x0 add r0, r7, #0x0 add r1, r5, #0x0 @@ -327,7 +327,7 @@ _020836F0: mov r4, #0x0 _020836F2: add r0, r5, #0x0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0x0 pop {r3-r7, pc} @@ -435,7 +435,7 @@ sub_020837B4: ; 0x020837B4 mov r0, #0x14 mov r1, #0x31 add r6, r2, #0x0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 add r0, r6, #0x0 add r1, r4, #0x0 @@ -456,7 +456,7 @@ _020837E6: mov r5, #0x0 _020837E8: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0x0 pop {r4-r6, pc} .balign 4 @@ -501,7 +501,7 @@ sub_02083834: ; 0x02083834 mov r0, #0x14 mov r1, #0x19 add r5, r2, #0x0 - bl AllocFromHeap + bl Heap_Alloc add r6, r0, #0x0 mov r4, #0x0 mov r7, #0x8 @@ -531,7 +531,7 @@ _02083876: mov r4, #0x0 _02083878: add r0, r6, #0x0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0x0 pop {r3-r7, pc} nop @@ -570,7 +570,7 @@ sub_020838B4: ; 0x020838B4 bl CopyStringToU16Array mov r0, #0x14 add r1, r0, #0x0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 add r0, sp, #0x0 add r1, r4, #0x4 @@ -594,7 +594,7 @@ _020838F6: mov r5, #0x0 _020838F8: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0x0 add sp, #0x10 pop {r3-r5, pc} @@ -630,7 +630,7 @@ sub_02083930: ; 0x02083930 add r4, r0, #0x0 mov r0, #0x14 add r1, r4, #0x1 - bl AllocFromHeap + bl Heap_Alloc add r5, r0, #0x0 add r0, r7, #0x0 add r1, r5, #0x0 @@ -649,7 +649,7 @@ _02083964: mov r4, #0x0 _02083966: add r0, r5, #0x0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0x0 pop {r3-r7, pc} @@ -917,7 +917,7 @@ sub_02083B48: ; 0x02083B48 mov r0, #0x14 mov r1, #0x7 add r6, r2, #0x0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 add r0, r6, #0x0 add r1, r4, #0x0 @@ -936,7 +936,7 @@ _02083B76: mov r5, #0x0 _02083B78: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0x0 pop {r4-r6, pc} .balign 4 diff --git a/arm9/asm/unk_020854E0.s b/arm9/asm/unk_020854E0.s index a72e2591d..84d294524 100644 --- a/arm9/asm/unk_020854E0.s +++ b/arm9/asm/unk_020854E0.s @@ -29,7 +29,7 @@ sub_020854E0: ; 0x020854E0 str r0, [sp, #0x4] ldr r0, [sp, #0x20] mov r1, #0x1c - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0x0 mov r2, #0x1c add r4, r0, #0x0 @@ -67,7 +67,7 @@ sub_02085538: ; 0x02085538 mov r1, #0x1c add r6, r2, #0x0 str r3, [sp, #0x0] - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0x0 mov r2, #0x1c add r4, r0, #0x0 @@ -97,7 +97,7 @@ sub_02085578: ; 0x02085578 add r6, r1, #0x0 add r0, r7, #0x0 mov r1, #0x1c - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0x0 mov r2, #0x1c add r4, r0, #0x0 @@ -124,7 +124,7 @@ sub_020855B0: ; 0x020855B0 add r6, r1, #0x0 add r0, r7, #0x0 mov r1, #0x1c - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0x0 mov r2, #0x1c add r4, r0, #0x0 @@ -191,10 +191,10 @@ sub_0208562C: ; 0x0208562C ldr r0, [r4, #0x14] cmp r0, #0x0 beq _0208563A - bl FreeToHeap + bl Heap_Free _0208563A: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .balign 4 @@ -235,7 +235,7 @@ sub_02085644: ; 0x02085644 add r2, sp, #0x0 bl SetMonData add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free add r0, r6, #0x0 _0208569E: pop {r3-r7, pc} @@ -272,7 +272,7 @@ _020856BC: add r2, r5, #0x0 bl Mailbox_DeleteSlotI add r0, r6, #0x0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0x0 pop {r3-r7, pc} .balign 4 @@ -284,7 +284,7 @@ sub_020856F0: ; 0x020856F0 add r4, r0, #0x0 add r0, r5, #0x0 mov r1, #0x34 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x0 mov r2, #0x34 add r6, r0, #0x0 @@ -358,7 +358,7 @@ sub_0208578C: ; 0x0208578C bl String_Delete _0208579A: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .balign 4 @@ -418,7 +418,7 @@ sub_020857F8: ; 0x020857F8 mov r0, #0x3 mov r1, #0x28 lsl r2, r2, #0xc - bl CreateHeap + bl Heap_Create add r0, r4, #0x0 mov r1, #0x1c mov r2, #0x28 @@ -629,6 +629,6 @@ sub_020859A0: ; 0x020859A0 add r0, r5, #0x0 bl OverlayManager_FreeData ldr r0, [r4, #0x0] - bl DestroyHeap + bl Heap_Destroy mov r0, #0x1 pop {r3-r5, pc} diff --git a/arm9/asm/unk_020859C0.s b/arm9/asm/unk_020859C0.s index 4c036745a..c6a608022 100644 --- a/arm9/asm/unk_020859C0.s +++ b/arm9/asm/unk_020859C0.s @@ -184,7 +184,7 @@ sub_020859C0: ; 0x020859C0 mov r0, #0x3 mov r1, #0x35 lsl r2, r2, #0x12 - bl CreateHeap + bl Heap_Create mov r0, #0x35 bl ov62_02230F3C bl ov62_0222F7E0 @@ -505,7 +505,7 @@ sub_02085C08: ; 0x02085C08 add r0, r4, #0x0 add r0, #0xe4 ldr r0, [r0, #0x0] - bl FreeToHeap + bl Heap_Free add r0, r4, #0x0 add r0, #0xe8 ldr r0, [r0, #0x0] @@ -539,7 +539,7 @@ sub_02085C08: ; 0x02085C08 bl sub_02085D8C ldr r0, _02085D64 ; =0x00000428 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free add r0, r4, #0x0 bl ov62_0222DAEC mov r0, #0x73 @@ -570,7 +570,7 @@ sub_02085C08: ; 0x02085C08 bl OverlayManager_FreeData bl sub_0201CD04 mov r0, #0x35 - bl DestroyHeap + bl Heap_Destroy ldr r0, _02085D68 ; =SDK_OVERLAY_OVERLAY_08_ID bl UnloadOverlayByID mov r0, #0x1 @@ -805,11 +805,11 @@ _02085F14: b _02085F38 _02085F20: ldr r0, [r6, #0xc] - bl FreeToHeap + bl Heap_Free ldr r0, [r6, #0x8] - bl FreeToHeap + bl Heap_Free add r0, r6, #0x0 - bl FreeToHeap + bl Heap_Free add sp, #0xc mov r0, #0x1 pop {r4-r7, pc} @@ -828,7 +828,7 @@ ShowSealCapsuleEditor: ; 0x02085F48 add r5, r1, #0x0 mov r0, #0xb mov r1, #0x18 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0x0 add r2, r4, #0x0 mov r1, #0x18 @@ -841,7 +841,7 @@ _02085F5E: mov r0, #0xb mov r1, #0x30 str r5, [r4, #0x10] - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x0 mov r2, #0x30 str r0, [r4, #0x8] @@ -854,7 +854,7 @@ _02085F5E: mov r1, #0x40 str r5, [r0, #0x28] mov r0, #0xb - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x0 mov r2, #0x40 str r0, [r4, #0xc] diff --git a/arm9/asm/unk_02086084.s b/arm9/asm/unk_02086084.s index 71b705575..7167e138d 100644 --- a/arm9/asm/unk_02086084.s +++ b/arm9/asm/unk_02086084.s @@ -23,7 +23,7 @@ sub_02086084: ; 0x02086084 mov r0, #0x3 mov r1, #0x47 lsl r2, r2, #0x12 - bl CreateHeap + bl Heap_Create add r0, r5, #0x0 mov r1, #0x80 mov r2, #0x47 @@ -208,7 +208,7 @@ sub_020861DC: ; 0x020861DC mov r1, #0x4 bl FreeBgTilemapBuffer ldr r0, [r4, #0x4] - bl FreeToHeap + bl Heap_Free bl sub_0201C29C ldr r0, [r4, #0x3c] bl sub_020072E8 @@ -219,7 +219,7 @@ sub_020861DC: ; 0x020861DC add r0, r5, #0x0 bl OverlayManager_FreeData mov r0, #0x47 - bl DestroyHeap + bl Heap_Destroy mov r0, #0x1 pop {r3-r5, pc} .balign 4 @@ -375,7 +375,7 @@ _020863B6: str r0, [r4, #0x0] b _020863CE _020863C4: - bl FreeToHeap + bl Heap_Free add sp, #0xc mov r0, #0x1 pop {r4-r7, pc} @@ -394,7 +394,7 @@ sub_020863DC: ; 0x020863DC add r4, r1, #0x0 mov r0, #0xb mov r1, #0x1c - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r2, r0, #0x0 add r3, r2, #0x0 mov r1, #0x1c diff --git a/arm9/asm/unk_02086414.s b/arm9/asm/unk_02086414.s index ce530f58b..87d3ab3fb 100644 --- a/arm9/asm/unk_02086414.s +++ b/arm9/asm/unk_02086414.s @@ -879,7 +879,7 @@ sub_02086A80: ; 0x02086A80 mov r1, #0x12 lsl r1, r1, #0xa add r4, r0, #0x0 - bl AllocFromHeap + bl Heap_Alloc add r2, r0, #0x0 mov r0, #0x1 str r0, [sp, #0x0] @@ -935,7 +935,7 @@ sub_02086AF0: ; 0x02086AF0 add r0, r5, #0x0 bl sub_02012DE4 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r3-r5, pc} thumb_func_start sub_02086B08 @@ -975,7 +975,7 @@ sub_02086B40: ; 0x02086B40 add r5, r0, #0x0 ldr r0, [r5, #0x0] mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 bne _02086B54 bl GF_AssertFail @@ -1023,10 +1023,10 @@ _02086B9C: thumb_func_start sub_02086BA0 sub_02086BA0: ; 0x02086BA0 - ldr r3, _02086BA4 ; =FreeToHeap + ldr r3, _02086BA4 ; =Heap_Free bx r3 .balign 4 -_02086BA4: .word FreeToHeap +_02086BA4: .word Heap_Free thumb_func_start sub_02086BA8 sub_02086BA8: ; 0x02086BA8 diff --git a/arm9/asm/unk_02087A6C.s b/arm9/asm/unk_02087A6C.s index d4da53e69..91eeec8c8 100644 --- a/arm9/asm/unk_02087A6C.s +++ b/arm9/asm/unk_02087A6C.s @@ -13,7 +13,7 @@ UNK_020FD144: ; 0x020FD144 sub_02087A6C: ; 0x02087A6C push {r3, lr} mov r1, #0x18 - bl AllocFromHeap + bl Heap_Alloc add r3, r0, #0x0 mov r2, #0x18 mov r1, #0x0 @@ -32,7 +32,7 @@ sub_02087A84: ; 0x02087A84 bl GF_AssertFail _02087A8E: add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .balign 4 @@ -107,17 +107,17 @@ _02087B1A: bl GF_AssertFail _02087B24: ldr r0, [r4, #0x0] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x4] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x8] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0xc] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x10] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x14] - bl FreeToHeap + bl Heap_Free mov r0, #0x0 str r0, [r4, #0x0] str r0, [r4, #0x4] diff --git a/arm9/asm/unk_02087D00.s b/arm9/asm/unk_02087D00.s index 136b0053a..7e9a75622 100644 --- a/arm9/asm/unk_02087D00.s +++ b/arm9/asm/unk_02087D00.s @@ -50,7 +50,7 @@ sub_02087D00: ; 0x02087D00 str r0, [sp, #0x0] add r0, r5, #0x0 lsl r1, r1, #0x2 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0xcf mov r1, #0x0 lsl r2, r2, #0x2 @@ -159,7 +159,7 @@ _02087DEE: ldr r0, [sp, #0x4] bl MessageFormat_Delete add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free ldr r0, [sp, #0x0] strb r0, [r7, #0x0] mov r0, #0x5 @@ -171,10 +171,10 @@ _02087DEE: thumb_func_start sub_02087E14 sub_02087E14: ; 0x02087E14 - ldr r3, _02087E18 ; =FreeToHeap + ldr r3, _02087E18 ; =Heap_Free bx r3 .balign 4 -_02087E18: .word FreeToHeap +_02087E18: .word Heap_Free thumb_func_start sub_02087E1C sub_02087E1C: ; 0x02087E1C @@ -206,7 +206,7 @@ sub_02087E40: ; 0x02087E40 mov r0, #0x3 mov r1, #0x2c lsl r2, r2, #0xc - bl CreateHeap + bl Heap_Create add r0, r4, #0x0 mov r1, #0x18 mov r2, #0x2c @@ -294,7 +294,7 @@ sub_02087EE8: ; 0x02087EE8 add r0, r5, #0x0 bl OverlayManager_FreeData ldr r0, [r4, #0x0] - bl DestroyHeap + bl Heap_Destroy mov r0, #0x1 pop {r3-r5, pc} .balign 4 @@ -376,7 +376,7 @@ _02087F86: strb r0, [r1, #0x2] ldr r0, [r5, #0x0] mov r1, #0x40 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x0 mov r2, #0x40 add r4, r0, #0x0 @@ -426,7 +426,7 @@ _02087FE6: ldrb r6, [r0, #0x0] strb r6, [r5, #0x8] ldr r0, [r5, #0x10] - bl FreeToHeap + bl Heap_Free cmp r6, #0x7 bne _02087FFE mov r0, #0x0 @@ -434,7 +434,7 @@ _02087FE6: _02087FFE: ldr r0, [r5, #0x0] mov r1, #0x30 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 ldr r0, [r5, #0xc] ldr r0, [r0, #0x10] @@ -490,7 +490,7 @@ _0208806E: ldrb r0, [r0, #0x14] strb r0, [r5, #0x8] ldr r0, [r5, #0x10] - bl FreeToHeap + bl Heap_Free cmp r4, #0x1 bne _02088084 mov r0, #0x0 @@ -517,7 +517,7 @@ sub_020880A0: ; 0x020880A0 add r5, r0, #0x0 ldr r0, [r5, #0x0] mov r1, #0xc - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x0 mov r2, #0xc add r4, r0, #0x0 @@ -574,9 +574,9 @@ sub_0208810C: ; 0x0208810C _0208811E: ldr r4, [r4, #0x10] ldr r0, [r4, #0x4] - bl FreeToHeap + bl Heap_Free add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free mov r0, #0x6 pop {r4, pc} @@ -586,7 +586,7 @@ sub_02088130: ; 0x02088130 add r5, r0, #0x0 ldr r0, [r5, #0x0] mov r1, #0x30 - bl AllocFromHeap + bl Heap_Alloc ldr r2, [r5, #0xc] add r4, r0, #0x0 ldrb r1, [r2, #0x1] @@ -650,9 +650,9 @@ sub_020881AC: ; 0x020881AC _020881BE: ldr r0, [r4, #0x10] ldr r0, [r0, #0x24] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x10] - bl FreeToHeap + bl Heap_Free mov r0, #0x0 pop {r4, pc} diff --git a/arm9/asm/unk_02088320.s b/arm9/asm/unk_02088320.s index 33e82f4b9..bc452a8fd 100644 --- a/arm9/asm/unk_02088320.s +++ b/arm9/asm/unk_02088320.s @@ -18,7 +18,7 @@ sub_02088320: ; 0x02088320 add r6, r0, #0x0 add r7, r2, #0x0 str r3, [sp, #0x0] - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x59 mov r1, #0x0 lsl r2, r2, #0x2 @@ -54,7 +54,7 @@ sub_02088360: ; 0x02088360 lsl r2, r2, #0x2 bl MI_CpuFill8 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_start sub_0208837C @@ -138,7 +138,7 @@ _02088402: ldr r0, [sp, #0x0] mov r1, #0x4 ldr r0, [r0, #0x0] - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x16 ldr r1, [sp, #0x0] lsl r2, r2, #0x4 @@ -160,7 +160,7 @@ sub_0208843C: ; 0x0208843C mov r0, #0x16 lsl r0, r0, #0x4 ldr r0, [r5, r0] - bl FreeToHeap + bl Heap_Free ldr r0, [r5, #0x10] bl sub_0201FD58 mov r0, #0x15 @@ -216,7 +216,7 @@ sub_02088490: ; 0x02088490 _020884B4: ldr r0, [r5, #0x0] mov r1, #0x8 - bl AllocFromHeap + bl Heap_Alloc str r0, [sp, #0x38] mov r1, #0x0 mov r2, #0x8 @@ -259,15 +259,15 @@ _020884D8: bl sub_02009DE0 ldr r0, [r5, #0x0] mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 ldr r0, [r5, #0x0] mov r1, #0x8 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #0x8] ldr r0, [r5, #0x0] mov r1, #0x24 - bl AllocFromHeap + bl Heap_Alloc ldr r1, [r4, #0x8] mov r3, #0xe str r0, [r1, #0x0] @@ -464,7 +464,7 @@ sub_02088694: ; 0x02088694 add r1, r2, r1 strb r0, [r1, #0x1] add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r3-r5, pc} .balign 4 diff --git a/arm9/asm/unk_02088858.s b/arm9/asm/unk_02088858.s index ec0470caf..f5e2f5e5d 100644 --- a/arm9/asm/unk_02088858.s +++ b/arm9/asm/unk_02088858.s @@ -89,14 +89,14 @@ sub_020888DC: ; 0x020888DC mov r0, #0x3 mov r1, #0x31 lsl r2, r2, #0xc - bl CreateHeap + bl Heap_Create add r0, r4, #0x0 bl OverlayManager_GetField18 ldr r0, [r0, #0x8] mov r1, #0x31 bl sub_02088898 mov r0, #0x31 - bl DestroyHeap + bl Heap_Destroy mov r0, #0x0 bl OS_ResetSystem mov r0, #0x1 diff --git a/arm9/asm/unk_0208898C.s b/arm9/asm/unk_0208898C.s index 36cc02742..7af5f9aab 100644 --- a/arm9/asm/unk_0208898C.s +++ b/arm9/asm/unk_0208898C.s @@ -33,7 +33,7 @@ sub_020889B0: ; 0x020889B0 mov r0, #0x3 mov r1, #0x37 lsl r2, r2, #0xe - bl CreateHeap + bl Heap_Create add r0, r4, #0x0 mov r1, #0x24 mov r2, #0x37 @@ -137,7 +137,7 @@ sub_02088A78: ; 0x02088A78 bl OverlayManager_GetField18 ldr r0, [r4, #0xc] ldr r6, [r4, #0x0] - bl FreeToHeap + bl Heap_Free add r0, r4, #0x0 mov r1, #0x0 mov r2, #0x24 @@ -145,7 +145,7 @@ sub_02088A78: ; 0x02088A78 add r0, r5, #0x0 bl OverlayManager_FreeData add r0, r6, #0x0 - bl DestroyHeap + bl Heap_Destroy mov r0, #0x1 pop {r4-r6, pc} .balign 4 diff --git a/arm9/asm/unk_02088F0C.s b/arm9/asm/unk_02088F0C.s index ba9dbd2b8..767e718d7 100644 --- a/arm9/asm/unk_02088F0C.s +++ b/arm9/asm/unk_02088F0C.s @@ -548,7 +548,7 @@ sub_02088F0C: ; 0x02088F0C add r5, r1, #0x0 ldr r1, _02088F44 ; =0x0000195C add r6, r0, #0x0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 add r0, r6, #0x0 str r5, [r4, #0x0] @@ -581,7 +581,7 @@ sub_02088F4C: ; 0x02088F4C ldr r0, [r4, #0x4] bl EasyChatManager_Delete add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free _02088F5E: pop {r4, pc} diff --git a/arm9/asm/unk_02089498.s b/arm9/asm/unk_02089498.s index 21c43832e..3eedf37c9 100644 --- a/arm9/asm/unk_02089498.s +++ b/arm9/asm/unk_02089498.s @@ -42,7 +42,7 @@ sub_02089498: ; 0x02089498 mov r0, #0x3 mov r1, #0x58 lsl r2, r2, #0x10 - bl CreateHeap + bl Heap_Create add r0, r5, #0x0 mov r1, #0x38 mov r2, #0x58 @@ -197,7 +197,7 @@ sub_020895F0: ; 0x020895F0 add r0, r5, #0x0 bl OverlayManager_FreeData add r0, r4, #0x0 - bl DestroyHeap + bl Heap_Destroy mov r0, #0x0 bl OS_ResetSystem mov r0, #0x1 @@ -329,7 +329,7 @@ sub_020896E0: ; 0x020896E0 mov r1, #0x0 bl FreeBgTilemapBuffer ldr r0, [r4, #0x14] - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_start sub_02089734 diff --git a/arm9/asm/unk_02089960.s b/arm9/asm/unk_02089960.s index 50f96c02a..81c6241f8 100644 --- a/arm9/asm/unk_02089960.s +++ b/arm9/asm/unk_02089960.s @@ -38,7 +38,7 @@ sub_02089960: ; 0x02089960 mov r0, #0x3 mov r1, #0x58 lsl r2, r2, #0x10 - bl CreateHeap + bl Heap_Create add r0, r5, #0x0 mov r1, #0x3c mov r2, #0x58 @@ -141,7 +141,7 @@ sub_02089A40: ; 0x02089A40 add r0, r5, #0x0 bl OverlayManager_FreeData add r0, r4, #0x0 - bl DestroyHeap + bl Heap_Destroy ldr r0, _02089A64 ; =SDK_OVERLAY_OVERLAY_83_ID ldr r1, _02089A68 ; =ov83_0223A360 bl RegisterMainOverlay @@ -268,7 +268,7 @@ sub_02089B2C: ; 0x02089B2C mov r1, #0x0 bl FreeBgTilemapBuffer ldr r0, [r4, #0x18] - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_start sub_02089B80 diff --git a/arm9/asm/unk_0208A258.s b/arm9/asm/unk_0208A258.s index 56cab716b..b0a88c9a0 100644 --- a/arm9/asm/unk_0208A258.s +++ b/arm9/asm/unk_0208A258.s @@ -52,7 +52,7 @@ _0208A2A6: lsl r1, r1, #0x6 strb r0, [r4, r1] ldr r0, [r4, #0x4] - bl FreeToHeap + bl Heap_Free add r0, r5, #0x0 bl FieldSystem_LoadFieldOverlay mov r0, #0x11 diff --git a/arm9/asm/unk_0208A338.s b/arm9/asm/unk_0208A338.s index 5d6121368..d96270017 100644 --- a/arm9/asm/unk_0208A338.s +++ b/arm9/asm/unk_0208A338.s @@ -13,7 +13,7 @@ sub_0208A338: ; 0x0208A338 add r5, r0, #0x0 mov r0, #0x20 mov r1, #0x6c - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0x0 mov r0, #0x19 str r5, [r4, #0x0] @@ -85,7 +85,7 @@ sub_0208A3C8: ; 0x0208A3C8 add r0, r4, #0x0 bl sub_0208A400 add r0, r4, #0x0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .balign 4 diff --git a/arm9/global.inc b/arm9/global.inc index 933bda30f..99b3685f9 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -1022,17 +1022,17 @@ .extern SetKeyRepeatTimers .extern SetSoftResetDisableMask .extern ClearSoftResetDisableMask -.extern InitHeapSystem -.extern CreateHeap -.extern CreateHeapAtEnd -.extern DestroyHeap -.extern AllocFromHeap -.extern AllocFromHeapAtEnd -.extern FreeToHeap -.extern FreeToHeapExplicit -.extern GF_ExpHeap_FndGetTotalFreeSize -.extern GF_ExpHeap_FndInitAllocator -.extern ReallocFromHeap +.extern Heap_InitSystem +.extern Heap_Create +.extern Heap_CreateAtEnd +.extern Heap_Destroy +.extern Heap_Alloc +.extern Heap_AllocAtEnd +.extern Heap_Free +.extern Heap_FreeExplicit +.extern HeapExp_FndGetTotalFreeSize +.extern HeapExp_FndInitAllocator +.extern Heap_Realloc .extern GF_heap_c_dummy_return_true .extern BgConfig_Alloc .extern BgConfig_GetHeapId diff --git a/arm9/overlays/04/asm/ov04_021D74E0.s b/arm9/overlays/04/asm/ov04_021D74E0.s index b22f87e58..450ec71e3 100644 --- a/arm9/overlays/04/asm/ov04_021D74E0.s +++ b/arm9/overlays/04/asm/ov04_021D74E0.s @@ -16,7 +16,7 @@ ov04_021D74E0: ; 0x021D74E0 _021D74F2: ldr r1, _021D7648 ; =0x00001FAC add r0, r4, #0 - bl AllocFromHeap + bl Heap_Alloc ldr r2, _021D7644 ; =ov04_0220FBC0 mov r1, #0x1f str r0, [r2, #4] @@ -48,7 +48,7 @@ _021D74F2: str r4, [r0, r1] ldr r1, _021D764C ; =0x0002B020 add r0, r4, #0 - bl AllocFromHeap + bl Heap_Alloc ldr r2, _021D7644 ; =ov04_0220FBC0 ldr r1, _021D7650 ; =0x00001F04 ldr r3, [r2] @@ -202,13 +202,13 @@ ov04_021D7660: ; 0x021D7660 ldr r0, [r2, r1] sub r1, #0x50 ldr r1, [r2, r1] - bl FreeToHeapExplicit + bl Heap_FreeExplicit ldr r1, _021D76A0 ; =ov04_0220FBC0 ldr r0, _021D76A8 ; =0x00001F54 ldr r2, [r1] ldr r1, [r1, #4] ldr r0, [r2, r0] - bl FreeToHeapExplicit + bl Heap_FreeExplicit ldr r0, _021D76A0 ; =ov04_0220FBC0 mov r1, #0 str r1, [r0, #4] diff --git a/arm9/overlays/04/asm/ov04_021D868C.s b/arm9/overlays/04/asm/ov04_021D868C.s index 6f5f0b31a..9aa1da9b8 100644 --- a/arm9/overlays/04/asm/ov04_021D868C.s +++ b/arm9/overlays/04/asm/ov04_021D868C.s @@ -522,7 +522,7 @@ ov04_021D8A7C: ; 0x021D8A7C cmp r1, #0 bne _021D8ACA ldr r1, _021D8BD0 ; =0x000035DC - bl AllocFromHeap + bl Heap_Alloc ldr r2, _021D8BCC ; =ov04_0220FBC8 mov r1, #0x35 str r0, [r2] @@ -766,7 +766,7 @@ ov04_021D8C6C: ; 0x021D8C6C lsl r0, r0, #8 ldr r0, [r2, r0] ldr r1, [r1] - bl FreeToHeapExplicit + bl Heap_FreeExplicit mov r1, #0 ldr r0, _021D8CBC ; =ov04_0220FBC8 cmp r4, #0 diff --git a/arm9/overlays/05/asm/ov05_021D74E0.s b/arm9/overlays/05/asm/ov05_021D74E0.s index 587460d5b..4b9ccd0d4 100644 --- a/arm9/overlays/05/asm/ov05_021D74E0.s +++ b/arm9/overlays/05/asm/ov05_021D74E0.s @@ -69,7 +69,7 @@ _021D7564: mov r0, #3 ldr r2, [r2, #4] mov r1, #4 - bl CreateHeap + bl Heap_Create ldr r0, [r4, #4] cmp r0, #0 beq _021D757A @@ -77,7 +77,7 @@ _021D7564: _021D757A: mov r0, #4 mov r1, #0x28 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x28 str r0, [r4, #4] @@ -355,13 +355,13 @@ _021D7806: add r1, r0, #0 bl Main_SetVBlankIntrCB ldr r0, [r4, #8] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #4] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #4] mov r0, #4 - bl DestroyHeap + bl Heap_Destroy ldr r0, [r4, #0x70] ldr r0, [r0] lsl r0, r0, #8 @@ -1157,7 +1157,7 @@ ov05_021D7EE8: ; 0x021D7EE8 add r6, r1, #0 add r5, r0, #0 mov r1, #0x64 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r0, #0x60 add r1, r6, #0 @@ -1189,7 +1189,7 @@ _021D7F18: blt _021D7F18 _021D7F2C: strh r3, [r4] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 pop {r4, r5, r6, pc} nop @@ -1207,10 +1207,10 @@ ov05_021D7F40: ; 0x021D7F40 thumb_func_start ov05_021D7F44 ov05_021D7F44: ; 0x021D7F44 - ldr r3, _021D7F48 ; =FreeToHeap + ldr r3, _021D7F48 ; =Heap_Free bx r3 .balign 4, 0 -_021D7F48: .word FreeToHeap +_021D7F48: .word Heap_Free .section .rodata diff --git a/arm9/overlays/05/asm/ov05_021D7F4C.s b/arm9/overlays/05/asm/ov05_021D7F4C.s index 84f7ce6ae..0170fa630 100644 --- a/arm9/overlays/05/asm/ov05_021D7F4C.s +++ b/arm9/overlays/05/asm/ov05_021D7F4C.s @@ -11,7 +11,7 @@ ov05_021D7F4C: ; 0x021D7F4C add r0, r5, #0 mov r1, #0x14 add r6, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 str r7, [r4] str r5, [r4, #4] @@ -21,7 +21,7 @@ ov05_021D7F4C: ; 0x021D7F4C str r6, [r4, #8] add r0, r5, #0 add r1, r7, #0 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #0xc] ldr r1, [r4, #0xc] mov r0, #0 @@ -31,7 +31,7 @@ ov05_021D7F4C: ; 0x021D7F4C bl sub_0201B578 add r1, r0, #0 add r0, r5, #0 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #0x10] ldr r1, [r4, #0x10] add r0, r6, #0 @@ -60,11 +60,11 @@ _021D7FAA: blt _021D7FAA _021D7FBC: ldr r0, [r5, #0xc] - bl FreeToHeap + bl Heap_Free ldr r0, [r5, #0x10] - bl FreeToHeap + bl Heap_Free add r0, r5, #0 - bl FreeToHeap + bl Heap_Free pop {r4, r5, r6, pc} thumb_func_start ov05_021D7FD0 @@ -158,7 +158,7 @@ _021D806C: cmp r1, #0 beq _021D807A ldr r0, [r5, #4] - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #0x10] _021D807A: ldr r3, [r6, #8] @@ -205,7 +205,7 @@ _021D80BE: cmp r0, #0 beq _021D80CC ldr r0, [r4, #0x10] - bl FreeToHeap + bl Heap_Free _021D80CC: ldr r0, [r4, #4] bl SysTask_Destroy diff --git a/arm9/overlays/05/asm/ov05_021D9320.s b/arm9/overlays/05/asm/ov05_021D9320.s index 0a836bb61..f30a73cbf 100644 --- a/arm9/overlays/05/asm/ov05_021D9320.s +++ b/arm9/overlays/05/asm/ov05_021D9320.s @@ -36,7 +36,7 @@ _021D9348: add r0, r4, #0 add r1, r2, #0 mul r1, r3 - bl AllocFromHeap + bl Heap_Alloc add r7, r0, #0 mov r0, #0 str r0, [sp, #0x1c] @@ -59,7 +59,7 @@ _021D9374: add r2, r4, #0 bl sub_02009668 ldr r0, [sp, #0x24] - bl FreeToHeap + bl Heap_Free ldr r0, [sp, #0x1c] add r6, r6, #4 add r0, r0, #1 @@ -149,7 +149,7 @@ _021D9432: blo _021D9432 _021D944A: add r0, r7, #0 - bl FreeToHeap + bl Heap_Free mov r0, #0x52 lsl r0, r0, #2 ldr r0, [r5, r0] @@ -189,7 +189,7 @@ _021D944A: lsl r1, r1, #2 str r0, [r5, r1] add r0, r6, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x2c pop {r4, r5, r6, r7, pc} nop @@ -655,17 +655,17 @@ ov05_021D9820: ; 0x021D9820 add r4, r1, #0 ldrh r0, [r5, r0] mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc add r6, r0, #0 ldr r0, _021D99F4 ; =0x00000162 mov r1, #8 ldrh r0, [r5, r0] - bl AllocFromHeap + bl Heap_Alloc str r0, [r6, #8] ldr r0, _021D99F4 ; =0x00000162 mov r1, #0x24 ldrh r0, [r5, r0] - bl AllocFromHeap + bl Heap_Alloc ldr r1, [r6, #8] add r2, r4, #0 str r0, [r1] diff --git a/arm9/overlays/05/asm/ov05_021D9A48.s b/arm9/overlays/05/asm/ov05_021D9A48.s index 59f0f8c45..2ca51e75c 100644 --- a/arm9/overlays/05/asm/ov05_021D9A48.s +++ b/arm9/overlays/05/asm/ov05_021D9A48.s @@ -157,7 +157,7 @@ ov05_021D9B54: ; 0x021D9B54 mov r1, #0xae mov r0, #4 lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc add r7, r0, #0 mov r1, #0 add r2, r7, #0 @@ -199,7 +199,7 @@ _021D9B98: mov r1, #4 add r0, r7, #0 add r2, r1, #0 - bl GF_ExpHeap_FndInitAllocator + bl HeapExp_FndInitAllocator mov r0, #0x6e mov r1, #4 bl NARC_New @@ -712,7 +712,7 @@ _021D9F54: bl NNS_G3dFreeAnmObj str r7, [r5, #0x10] ldr r0, [r5, #0x24] - bl FreeToHeap + bl Heap_Free _021D9F6E: mov r0, #0 str r0, [r5, #0x14] @@ -747,7 +747,7 @@ _021D9F90: mov r0, #0 str r0, [r5] ldr r0, [r5, #0x14] - bl FreeToHeap + bl Heap_Free _021D9FAC: mov r0, #0 str r0, [r5, #4] @@ -822,7 +822,7 @@ ov05_021DA018: ; 0x021DA018 ldr r0, [r4, r0] bl NARC_Delete add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _021DA038: pop {r4, pc} .balign 4, 0 @@ -1428,7 +1428,7 @@ ov05_021DA430: ; 0x021DA430 mov r1, #0xe mov r0, #4 lsl r1, r1, #6 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r2, #0xe mov r0, #0 @@ -1446,7 +1446,7 @@ ov05_021DA450: ; 0x021DA450 ldr r0, [r4] cmp r0, #0 beq _021DA462 - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4] _021DA462: diff --git a/arm9/overlays/05/asm/ov05_021DA5B8.s b/arm9/overlays/05/asm/ov05_021DA5B8.s index 7cc5f983b..0be9aa7df 100644 --- a/arm9/overlays/05/asm/ov05_021DA5B8.s +++ b/arm9/overlays/05/asm/ov05_021DA5B8.s @@ -8,17 +8,17 @@ ov05_021DA5B8: ; 0x021DA5B8 push {r3, lr} mov r0, #4 mov r1, #0x28 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0 str r1, [r0] pop {r3, pc} thumb_func_start ov05_021DA5C8 ov05_021DA5C8: ; 0x021DA5C8 - ldr r3, _021DA5CC ; =FreeToHeap + ldr r3, _021DA5CC ; =Heap_Free bx r3 .balign 4, 0 -_021DA5CC: .word FreeToHeap +_021DA5CC: .word Heap_Free thumb_func_start ov05_021DA5D0 ov05_021DA5D0: ; 0x021DA5D0 @@ -1080,7 +1080,7 @@ ov05_021DAE14: ; 0x021DAE14 cmp r0, #0 beq _021DAE3C add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #1 pop {r3, r4, r5, pc} _021DAE3C: @@ -1250,7 +1250,7 @@ ov05_021DAF78: ; 0x021DAF78 add r4, r1, #0 mov r0, #4 mov r1, #1 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r2, r0, #0 strb r4, [r2] ldr r0, [r5, #0x10] @@ -1338,7 +1338,7 @@ ov05_021DB030: ; 0x021DB030 push {r3, lr} mov r0, #4 mov r1, #0x10 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0 str r1, [r0] pop {r3, pc} @@ -1445,7 +1445,7 @@ _021DB106: cmp r1, r0 bne _021DB126 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0xc mov r0, #1 pop {r3, r4, r5, r6, pc} @@ -1512,7 +1512,7 @@ _021DB1A0: cmp r0, #0 beq _021DB1B4 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add sp, #0xc mov r0, #1 pop {r4, r5, pc} @@ -1576,7 +1576,7 @@ _021DB222: cmp r0, #0 beq _021DB236 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x10 mov r0, #1 pop {r4, r5, r6, pc} @@ -1727,7 +1727,7 @@ _021DB348: cmp r1, r0 bne _021DB368 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x18 mov r0, #1 pop {r3, r4, r5, r6, r7, pc} @@ -1834,7 +1834,7 @@ _021DB432: cmp r0, #0 beq _021DB446 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x10 mov r0, #1 pop {r3, r4, r5, r6, r7, pc} diff --git a/arm9/overlays/05/asm/ov05_021DB44C.s b/arm9/overlays/05/asm/ov05_021DB44C.s index 1e4e4290f..22155ea57 100644 --- a/arm9/overlays/05/asm/ov05_021DB44C.s +++ b/arm9/overlays/05/asm/ov05_021DB44C.s @@ -14,7 +14,7 @@ ov05_021DB44C: ; 0x021DB44C _021DB45A: mov r0, #4 mov r1, #0x14 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 ldr r0, _021DB4AC ; =ov05_021F65FC lsl r1, r6, #2 @@ -67,7 +67,7 @@ _021DB4BA: bl ov05_021DB7A0 ldr r1, [r4] mov r0, #4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit mov r0, #0 str r0, [r4] pop {r4, pc} @@ -326,7 +326,7 @@ _021DB6A4: mul r4, r1 mov r0, #4 add r1, r4, #0 - bl AllocFromHeap + bl Heap_Alloc ldr r1, [sp] add r2, r4, #0 str r0, [r1] @@ -419,7 +419,7 @@ _021DB73E: _021DB78A: ldr r1, [sp, #0x14] mov r0, #4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit ldr r0, [sp, #8] add sp, #0x1fc add sp, #0x20 @@ -433,7 +433,7 @@ ov05_021DB7A0: ; 0x021DB7A0 add r4, r0, #0 ldr r1, [r4] mov r0, #4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit mov r0, #0 str r0, [r4] pop {r4, pc} diff --git a/arm9/overlays/05/asm/ov05_021DB900.s b/arm9/overlays/05/asm/ov05_021DB900.s index a5a2224b4..d9ee140de 100644 --- a/arm9/overlays/05/asm/ov05_021DB900.s +++ b/arm9/overlays/05/asm/ov05_021DB900.s @@ -8,7 +8,7 @@ ov05_021DB900: ; 0x021DB900 push {r4, lr} mov r0, #4 mov r1, #8 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021DB912 bl GF_AssertFail @@ -54,7 +54,7 @@ _021DB958: lsl r4, r0, #2 mov r0, #4 add r1, r6, #0 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5] cmp r0, #0 bne _021DB974 @@ -62,7 +62,7 @@ _021DB958: _021DB974: mov r0, #4 add r1, r4, #0 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #4] cmp r0, #0 bne _021DB986 @@ -98,11 +98,11 @@ ov05_021DB9BC: ; 0x021DB9BC push {r4, lr} add r4, r0, #0 ldr r0, [r4, #4] - bl FreeToHeap + bl Heap_Free ldr r0, [r4] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_start ov05_021DB9D4 diff --git a/arm9/overlays/05/asm/ov05_021DBA00.s b/arm9/overlays/05/asm/ov05_021DBA00.s index bf3b0cf52..73a48ffd5 100644 --- a/arm9/overlays/05/asm/ov05_021DBA00.s +++ b/arm9/overlays/05/asm/ov05_021DBA00.s @@ -8,7 +8,7 @@ ov05_021DBA00: ; 0x021DBA00 push {r4, lr} mov r0, #4 mov r1, #0x38 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r0, #0 add r1, r4, #0 @@ -24,7 +24,7 @@ ov05_021DBA1C: ; 0x021DBA1C add r4, r0, #0 ldr r1, [r4] mov r0, #4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit mov r0, #0 str r0, [r4] pop {r4, pc} diff --git a/arm9/overlays/05/asm/ov05_021DBABC.s b/arm9/overlays/05/asm/ov05_021DBABC.s index 705b72665..39db99c88 100644 --- a/arm9/overlays/05/asm/ov05_021DBABC.s +++ b/arm9/overlays/05/asm/ov05_021DBABC.s @@ -8,7 +8,7 @@ ov05_021DBABC: ; 0x021DBABC push {r4, lr} mov r0, #4 mov r1, #0x48 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r0, #0 add r1, r4, #0 @@ -24,7 +24,7 @@ ov05_021DBAD8: ; 0x021DBAD8 add r4, r0, #0 ldr r1, [r4] mov r0, #4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit mov r0, #0 str r0, [r4] pop {r4, pc} diff --git a/arm9/overlays/05/asm/ov05_021DBEF4.s b/arm9/overlays/05/asm/ov05_021DBEF4.s index b41bad3e7..6f997a1d7 100644 --- a/arm9/overlays/05/asm/ov05_021DBEF4.s +++ b/arm9/overlays/05/asm/ov05_021DBEF4.s @@ -9,7 +9,7 @@ ov05_021DBEF4: ; 0x021DBEF4 mov r1, #0x42 mov r0, #4 lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc cmp r0, #0 beq _021DBF1E mov r2, #0 @@ -218,7 +218,7 @@ ov05_021DC06C: ; 0x021DC06C ldr r0, [r6, r4] cmp r0, #0 beq _021DC08A - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r6, r4] _021DC08A: @@ -250,7 +250,7 @@ ov05_021DC0AC: ; 0x021DC0AC push {r3, lr} cmp r0, #0 beq _021DC0B6 - bl FreeToHeap + bl Heap_Free _021DC0B6: pop {r3, pc} diff --git a/arm9/overlays/05/asm/ov05_021DC0B8.s b/arm9/overlays/05/asm/ov05_021DC0B8.s index c081f1fef..73f8721e8 100644 --- a/arm9/overlays/05/asm/ov05_021DC0B8.s +++ b/arm9/overlays/05/asm/ov05_021DC0B8.s @@ -9,7 +9,7 @@ ov05_021DC0B8: ; 0x021DC0B8 add r5, r0, #0 mov r0, #4 mov r1, #0x18 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 add r2, r4, #0 mov r1, #0x18 @@ -56,7 +56,7 @@ _021DC112: sub r1, r1, #1 bne _021DC112 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .balign 4, 0 @@ -458,7 +458,7 @@ _021DC3F6: add r1, r0, #0 mov r0, #4 lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc str r0, [r6, #0x10] mov r1, #0 mov r2, #0x39 @@ -526,7 +526,7 @@ ov05_021DC480: ; 0x021DC480 mov r2, #4 bl sub_02009668 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, pc} thumb_func_start ov05_021DC4AC @@ -547,7 +547,7 @@ _021DC4B4: cmp r4, #4 blt _021DC4B4 ldr r0, [r6, #0x10] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r6, #0x10] add r0, r6, #0 @@ -621,7 +621,7 @@ ov05_021DC554: ; 0x021DC554 add r5, r0, #0 mov r0, #4 lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r0, #0x41 lsl r0, r0, #2 @@ -692,7 +692,7 @@ _021DC5A2: bl NARC_Delete ldr r1, [r4] mov r0, #4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit mov r0, #0 str r0, [r4] _021DC5FE: @@ -1095,7 +1095,7 @@ _021DC8DC: cmp r0, #0 bne _021DC8F4 ldr r0, [r4, #0xc] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #0xc] pop {r3, r4, r5, pc} @@ -1230,7 +1230,7 @@ _021DC998: cmp r1, #0 ble _021DC9FE mov r0, #4 - bl AllocFromHeap + bl Heap_Alloc ldr r2, [r4, #0xc] ldr r1, _021DCA3C ; =0x00000F58 str r0, [r2, r1] @@ -1362,7 +1362,7 @@ _021DCAD2: bl ov05_021DC880 ldr r1, [r4, #0x10] mov r0, #4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit mov r0, #0 str r0, [r4, #0x10] ldr r0, [r4, #0x1c] @@ -1390,7 +1390,7 @@ _021DCB14: cmp r1, #0 beq _021DCB2C mov r0, #4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit ldr r1, [r4, #0xc] ldr r0, _021DCB64 ; =0x00000F58 mov r2, #0 @@ -1414,7 +1414,7 @@ _021DCB3E: _021DCB4C: ldr r1, [r4, #0xc] mov r0, #4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit mov r0, #0 str r0, [r4, #0xc] _021DCB58: @@ -1647,7 +1647,7 @@ ov05_021DCD04: ; 0x021DCD04 _021DCD14: ldr r1, _021DCD60 ; =0x00000F68 mov r0, #4 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #0xc] cmp r0, #0 bne _021DCD26 @@ -1702,7 +1702,7 @@ ov05_021DCD68: ; 0x021DCD68 _021DCD80: mov r0, #4 mov r1, #0x64 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #0x10] cmp r0, #0 bne _021DCD92 @@ -1905,7 +1905,7 @@ ov05_021DCECC: ; 0x021DCECC mov r3, #0xc0 bl BG_LoadPlttData ldr r0, [sp] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [sp] _021DCF0E: @@ -1947,7 +1947,7 @@ ov05_021DCF14: ; 0x021DCF14 mov r1, #2 bl BG_LoadCharTilesData ldr r0, [sp, #8] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [sp, #8] _021DCF62: @@ -2027,7 +2027,7 @@ _021DCFA0: ldr r0, [r0, #8] bl BgCommitTilemapBufferToVram ldr r0, [sp, #0x14] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [sp, #0x14] _021DD00A: diff --git a/arm9/overlays/05/asm/ov05_021E1374.s b/arm9/overlays/05/asm/ov05_021E1374.s index 2ccf5b4ee..215947d4f 100644 --- a/arm9/overlays/05/asm/ov05_021E1374.s +++ b/arm9/overlays/05/asm/ov05_021E1374.s @@ -14,7 +14,7 @@ ov05_021E1374: ; 0x021E1374 add r7, r0, #0 mov r0, #4 lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021E1396 bl GF_AssertFail @@ -197,7 +197,7 @@ _021E14FA: bl ov05_021E1514 b _021E150C _021E1502: - bl FreeToHeap + bl Heap_Free add sp, #8 mov r0, #1 pop {r3, r4, r5, pc} @@ -490,7 +490,7 @@ ov05_021E1724: ; 0x021E1724 add r6, r1, #0 mov r0, #4 mov r1, #0xc - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021E173C bl GF_AssertFail @@ -533,7 +533,7 @@ _021E1770: bl SysTask_Destroy mov r0, #4 add r1, r4, #0 - bl FreeToHeapExplicit + bl Heap_FreeExplicit _021E178E: pop {r4, pc} .balign 4, 0 diff --git a/arm9/overlays/05/asm/ov05_021E1AD8.s b/arm9/overlays/05/asm/ov05_021E1AD8.s index 37417cc0c..0f69d864a 100644 --- a/arm9/overlays/05/asm/ov05_021E1AD8.s +++ b/arm9/overlays/05/asm/ov05_021E1AD8.s @@ -163,7 +163,7 @@ ov05_021E1BF8: ; 0x021E1BF8 lsl r1, r1, #2 str r2, [sp, #0x18] add r5, r3, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021E1C18 add sp, #0x1c @@ -570,7 +570,7 @@ _021E1F22: ldr r0, [r6, #4] bl SysTask_Destroy add r0, r6, #0 - bl FreeToHeap + bl Heap_Free pop {r4, r5, r6, pc} .balign 4, 0 _021E1F30: .word 0x000005DC @@ -1167,7 +1167,7 @@ _021E23BE: ldr r0, [r6, #4] bl SysTask_Destroy add r0, r6, #0 - bl FreeToHeap + bl Heap_Free pop {r4, r5, r6, pc} .balign 4, 0 _021E23CC: .word 0x000005DC @@ -1436,7 +1436,7 @@ _021E25F6: ldr r0, [r6, #4] bl SysTask_Destroy add r0, r6, #0 - bl FreeToHeap + bl Heap_Free _021E2602: pop {r4, r5, r6, pc} .balign 4, 0 diff --git a/arm9/overlays/05/asm/ov05_021E2E88.s b/arm9/overlays/05/asm/ov05_021E2E88.s index c97fd46cb..c618416d1 100644 --- a/arm9/overlays/05/asm/ov05_021E2E88.s +++ b/arm9/overlays/05/asm/ov05_021E2E88.s @@ -79,7 +79,7 @@ ov05_021E2EE4: ; 0x021E2EE4 add r2, r7, #0 bl ov05_021E2E88 ldr r0, [sp, #4] - bl FreeToHeap + bl Heap_Free add sp, #8 pop {r3, r4, r5, r6, r7, pc} nop @@ -468,7 +468,7 @@ ov05_021E320C: ; 0x021E320C add r5, r0, #0 mov r0, #4 mov r1, #0x44 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r0, #0x16 mov r1, #4 @@ -502,9 +502,9 @@ ov05_021E3248: ; 0x021E3248 ldr r0, [r4, #0x40] bl String_Delete ldr r0, [r4, #0x38] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .balign 4, 0 diff --git a/arm9/overlays/05/asm/ov05_021E3340.s b/arm9/overlays/05/asm/ov05_021E3340.s index 17ca377f6..1b713f741 100644 --- a/arm9/overlays/05/asm/ov05_021E3340.s +++ b/arm9/overlays/05/asm/ov05_021E3340.s @@ -98,7 +98,7 @@ _021E33FE: cmp r0, #0 beq _021E3414 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #4 mov r0, #1 pop {r3, r4, r5, r6, pc} @@ -116,7 +116,7 @@ Field_GivePoketch: ; 0x021E3424 add r4, r0, #0 mov r0, #0xb mov r1, #4 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r2, r0, #0 mov r0, #0 str r0, [r2] diff --git a/arm9/overlays/05/asm/ov05_021E3444.s b/arm9/overlays/05/asm/ov05_021E3444.s index 0b7adc827..5d0553fde 100644 --- a/arm9/overlays/05/asm/ov05_021E3444.s +++ b/arm9/overlays/05/asm/ov05_021E3444.s @@ -38,7 +38,7 @@ ov05_021E3474: ; 0x021E3474 mov r1, #0x4c str r2, [sp] add r5, r3, #0 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x4c add r4, r0, #0 @@ -180,7 +180,7 @@ _021E3580: _021E3590: bl SysTask_Destroy add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #4 pop {r3, r4, pc} _021E359E: @@ -438,7 +438,7 @@ ov05_021E3768: ; 0x021E3768 push {r4, lr} mov r0, #4 mov r1, #0x30 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x30 add r4, r0, #0 @@ -478,7 +478,7 @@ _021E37B2: and r0, r1 str r0, [r2] add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} nop _021E37C8: .word 0xFFFF1FFF @@ -774,7 +774,7 @@ ov05_021E39FC: ; 0x021E39FC push {r4, r5, r6, lr} mov r0, #4 mov r1, #0x48 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x48 add r4, r0, #0 @@ -822,7 +822,7 @@ _021E3A56: and r0, r1 str r0, [r2] add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} nop _021E3A6C: .word 0xFFFF1FFF @@ -1457,7 +1457,7 @@ ov05_021E3F68: ; 0x021E3F68 bl sub_020690AC add r0, r4, #0 mov r1, #0x20 - bl AllocFromHeap + bl Heap_Alloc add r1, sp, #4 add r5, r0, #0 ldrh r0, [r1, #4] @@ -1480,9 +1480,9 @@ ov05_021E3F68: ; 0x021E3F68 mov r2, #0x20 bl ov05_021E40F0 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} @@ -1573,9 +1573,9 @@ ov05_021E4014: ; 0x021E4014 add r1, r4, #0 bl ov05_021E4118 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [sp, #4] - bl FreeToHeap + bl Heap_Free add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -1591,7 +1591,7 @@ ov05_021E4080: ; 0x021E4080 lsl r1, r1, #0xa str r2, [sp, #4] add r5, r3, #0 - bl AllocFromHeap + bl Heap_Alloc mov ip, r0 lsl r0, r5, #2 mov r7, #0 @@ -1682,7 +1682,7 @@ ov05_021E4118: ; 0x021E4118 ov05_021E4140: ; 0x021E4140 push {r4, lr} mov r1, #0x30 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x30 add r4, r0, #0 @@ -1693,10 +1693,10 @@ ov05_021E4140: ; 0x021E4140 thumb_func_start ov05_021E4158 ov05_021E4158: ; 0x021E4158 - ldr r3, _021E415C ; =FreeToHeap + ldr r3, _021E415C ; =Heap_Free bx r3 .balign 4, 0 -_021E415C: .word FreeToHeap +_021E415C: .word Heap_Free thumb_func_start ov05_021E4160 ov05_021E4160: ; 0x021E4160 @@ -1800,7 +1800,7 @@ _021E41CE: ov05_021E4220: ; 0x021E4220 push {r4, lr} mov r1, #0x30 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x30 add r4, r0, #0 @@ -1811,10 +1811,10 @@ ov05_021E4220: ; 0x021E4220 thumb_func_start ov05_021E4238 ov05_021E4238: ; 0x021E4238 - ldr r3, _021E423C ; =FreeToHeap + ldr r3, _021E423C ; =Heap_Free bx r3 .balign 4, 0 -_021E423C: .word FreeToHeap +_021E423C: .word Heap_Free thumb_func_start ov05_021E4240 ov05_021E4240: ; 0x021E4240 @@ -2000,7 +2000,7 @@ ov05_021E4394: ; 0x021E4394 add r6, r0, #0 mov r0, #4 mov r1, #0xcc - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0xcc add r7, r0, #0 @@ -2033,7 +2033,7 @@ _021E43CC: cmp r4, #0x30 blt _021E43CC add r0, r6, #0 - bl FreeToHeap + bl Heap_Free pop {r4, r5, r6, pc} .balign 4, 0 @@ -2205,7 +2205,7 @@ _021E4518: .word ov05_021F745C ov05_021E451C: ; 0x021E451C push {r3, lr} mov r1, #0x1c - bl AllocFromHeap + bl Heap_Alloc add r3, r0, #0 mov r2, #0x1c mov r1, #0 @@ -2218,10 +2218,10 @@ _021E452A: thumb_func_start ov05_021E4534 ov05_021E4534: ; 0x021E4534 - ldr r3, _021E4538 ; =FreeToHeap + ldr r3, _021E4538 ; =Heap_Free bx r3 .balign 4, 0 -_021E4538: .word FreeToHeap +_021E4538: .word Heap_Free thumb_func_start ov05_021E453C ov05_021E453C: ; 0x021E453C @@ -2397,7 +2397,7 @@ ov05_021E4688: ; 0x021E4688 push {r3, r4, r5, r6, r7, lr} mov r1, #0x24 add r6, r0, #0 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x24 add r7, r0, #0 @@ -2429,7 +2429,7 @@ _021E46BC: cmp r4, #8 blt _021E46BC add r0, r6, #0 - bl FreeToHeap + bl Heap_Free pop {r4, r5, r6, pc} .balign 4, 0 @@ -2531,7 +2531,7 @@ ov05_021E4788: ; 0x021E4788 push {r4, lr} mov r0, #4 mov r1, #0xe8 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0xe8 add r4, r0, #0 @@ -2551,7 +2551,7 @@ ov05_021E47A0: ; 0x021E47A0 bl ov05_021E4918 _021E47B2: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .balign 4, 0 diff --git a/arm9/overlays/05/asm/ov05_021E4AE4.s b/arm9/overlays/05/asm/ov05_021E4AE4.s index 2de5c00a1..337cf003c 100644 --- a/arm9/overlays/05/asm/ov05_021E4AE4.s +++ b/arm9/overlays/05/asm/ov05_021E4AE4.s @@ -155,10 +155,10 @@ ov05_021E4BE8: ; 0x021E4BE8 thumb_func_start ov05_021E4C00 ov05_021E4C00: ; 0x021E4C00 - ldr r3, _021E4C04 ; =FreeToHeap + ldr r3, _021E4C04 ; =Heap_Free bx r3 .balign 4, 0 -_021E4C04: .word FreeToHeap +_021E4C04: .word Heap_Free thumb_func_start ov05_021E4C08 ov05_021E4C08: ; 0x021E4C08 @@ -1093,7 +1093,7 @@ ov05_021E5294: ; 0x021E5294 add r1, r0, #0 add r0, r4, #0 mov r2, #0x20 - bl GF_ExpHeap_FndInitAllocator + bl HeapExp_FndInitAllocator pop {r4, pc} .section .rodata diff --git a/arm9/overlays/05/asm/ov05_021E5FD8.s b/arm9/overlays/05/asm/ov05_021E5FD8.s index bc12cfb88..3da70008e 100644 --- a/arm9/overlays/05/asm/ov05_021E5FD8.s +++ b/arm9/overlays/05/asm/ov05_021E5FD8.s @@ -2254,7 +2254,7 @@ _021E7198: str r0, [sp] mov r0, #4 mov r1, #0x10 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0 mov r0, #0 str r0, [r4] @@ -2298,7 +2298,7 @@ ov05_021E71E8: ; 0x021E71E8 add r0, r4, #0 bl ov05_021E6014 add r0, r6, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _021E7216: @@ -2394,7 +2394,7 @@ ov05_021E72B8: ; 0x021E72B8 add r5, r0, #0 mov r0, #4 add r1, r5, #0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0 bne _021E72CC bl GF_AssertFail @@ -2409,12 +2409,12 @@ _021E72CC: thumb_func_start ov05_021E72DC ov05_021E72DC: ; 0x021E72DC - ldr r3, _021E72E4 ; =FreeToHeapExplicit + ldr r3, _021E72E4 ; =Heap_FreeExplicit add r1, r0, #0 mov r0, #4 bx r3 .balign 4, 0 -_021E72E4: .word FreeToHeapExplicit +_021E72E4: .word Heap_FreeExplicit thumb_func_start ov05_021E72E8 ov05_021E72E8: ; 0x021E72E8 diff --git a/arm9/overlays/05/asm/ov05_021E7504.s b/arm9/overlays/05/asm/ov05_021E7504.s index 439a164e8..b707e69f6 100644 --- a/arm9/overlays/05/asm/ov05_021E7504.s +++ b/arm9/overlays/05/asm/ov05_021E7504.s @@ -130,7 +130,7 @@ _021E75EA: mov r1, #1 str r1, [r0] add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r7, #0 bl SysTask_Destroy _021E7606: @@ -269,7 +269,7 @@ _021E771C: mov r1, #1 str r1, [r0] add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r6, #0 bl SysTask_Destroy _021E7740: @@ -288,7 +288,7 @@ ov05_021E7750: ; 0x021E7750 mov r0, #4 mov r1, #0x14 add r7, r2, #0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0 mov r1, #0 mov r2, #0x14 diff --git a/arm9/overlays/05/asm/ov05_021E7C00.s b/arm9/overlays/05/asm/ov05_021E7C00.s index 991b5a815..3f218f8f5 100644 --- a/arm9/overlays/05/asm/ov05_021E7C00.s +++ b/arm9/overlays/05/asm/ov05_021E7C00.s @@ -8,7 +8,7 @@ ov05_021E7C00: ; 0x021E7C00 push {r4, lr} mov r1, #0x46 lsl r1, r1, #6 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bl ov05_021E7C1C add r0, r4, #0 @@ -16,10 +16,10 @@ ov05_021E7C00: ; 0x021E7C00 thumb_func_start ov05_021E7C14 ov05_021E7C14: ; 0x021E7C14 - ldr r3, _021E7C18 ; =FreeToHeap + ldr r3, _021E7C18 ; =Heap_Free bx r3 .balign 4, 0 -_021E7C18: .word FreeToHeap +_021E7C18: .word Heap_Free thumb_func_start ov05_021E7C1C ov05_021E7C1C: ; 0x021E7C1C @@ -137,7 +137,7 @@ ov05_021E7CD8: ; 0x021E7CD8 cmp r4, #0 beq _021E7D0E mov r0, #4 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd str r0, [sp, #4] ldr r2, [sp, #4] add r0, r6, #0 @@ -247,7 +247,7 @@ _021E7DBE: ldr r0, [sp, #4] cmp r0, #0 beq _021E7DD2 - bl FreeToHeap + bl Heap_Free _021E7DD2: add sp, #0x14 pop {r4, r5, r6, r7, pc} diff --git a/arm9/overlays/05/asm/ov05_021E80F8.s b/arm9/overlays/05/asm/ov05_021E80F8.s index ddbcd107d..f6247ddf7 100644 --- a/arm9/overlays/05/asm/ov05_021E80F8.s +++ b/arm9/overlays/05/asm/ov05_021E80F8.s @@ -7,7 +7,7 @@ ov05_021E80F8: ; 0x021E80F8 push {r3, lr} mov r1, #0x14 - bl AllocFromHeap + bl Heap_Alloc add r3, r0, #0 mov r2, #0x14 mov r1, #0 @@ -29,7 +29,7 @@ ov05_021E8110: ; 0x021E8110 bl RemoveWindow _021E8120: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_start ov05_021E8128 diff --git a/arm9/overlays/05/asm/ov05_021E8310.s b/arm9/overlays/05/asm/ov05_021E8310.s index d8746c584..24e47d837 100644 --- a/arm9/overlays/05/asm/ov05_021E8310.s +++ b/arm9/overlays/05/asm/ov05_021E8310.s @@ -245,7 +245,7 @@ Field_SaveStatsPrinter_Print: ; 0x021E84F4 add r4, r0, #0 ldr r0, [r4, #4] mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #0x10] mov r3, #1 str r3, [sp] @@ -303,7 +303,7 @@ Field_SaveStatsPrinter_RemoveFromScreen: ; 0x021E856C ldr r0, [r4, #0x10] bl RemoveWindow ldr r0, [r4, #0x10] - bl FreeToHeap + bl Heap_Free pop {r4, pc} .balign 4, 0 @@ -315,7 +315,7 @@ Field_SaveStatsPrinter_New: ; 0x021E8588 add r0, r5, #0 mov r1, #0x34 add r7, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 str r6, [r4] str r5, [r4, #4] @@ -359,7 +359,7 @@ Field_SaveStatsPrinter_Delete: ; 0x021E85E4 ldr r0, [r4, #0x14] bl MessageFormat_Delete add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_start Field_SaveGame diff --git a/arm9/overlays/05/asm/ov05_021E8860.s b/arm9/overlays/05/asm/ov05_021E8860.s index c7a576e22..58e8639c4 100644 --- a/arm9/overlays/05/asm/ov05_021E8860.s +++ b/arm9/overlays/05/asm/ov05_021E8860.s @@ -21,7 +21,7 @@ ov05_021E8860: ; 0x021E8860 bl GX_ResetBankForBG mov r0, #4 add r1, r0, #0 - bl AllocFromHeap + bl Heap_Alloc add r7, r0, #0 mov r0, #0 add r1, r7, #0 @@ -64,7 +64,7 @@ ov05_021E88C0: ; 0x021E88C0 bl GfGfx_EngineATogglePlanes ldr r1, [r4] mov r0, #4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit pop {r4, pc} .section .rodata diff --git a/arm9/overlays/05/asm/ov05_021E88E8.s b/arm9/overlays/05/asm/ov05_021E88E8.s index 0e506b66f..2ddc9d5fd 100644 --- a/arm9/overlays/05/asm/ov05_021E88E8.s +++ b/arm9/overlays/05/asm/ov05_021E88E8.s @@ -31,7 +31,7 @@ _021E8906: ; jump table _021E8912: mov r0, #4 mov r1, #0x20 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #0xc] mov r1, #0 mov r2, #0x20 @@ -174,7 +174,7 @@ _021E8A42: bl ov05_021E37A4 ldr r1, [r4, #0xc] mov r0, #4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit add r0, r6, #0 bl sub_0200621C _021E8A56: @@ -213,7 +213,7 @@ _021E8A86: ; jump table _021E8A92: mov r0, #4 mov r1, #0x20 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #0xc] mov r1, #0 mov r2, #0x20 @@ -356,7 +356,7 @@ _021E8BC2: bl ov05_021E37A4 ldr r1, [r4, #0xc] mov r0, #4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit add r0, r6, #0 bl sub_0200621C _021E8BD6: @@ -397,7 +397,7 @@ _021E8C0A: ; jump table _021E8C18: mov r0, #4 mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #0xc] mov r2, #0x10 mov r1, #0 @@ -512,7 +512,7 @@ _021E8CE6: _021E8D00: ldr r1, [r4, #0xc] mov r0, #4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit add r0, r6, #0 bl sub_0200621C mov r0, #1 @@ -553,7 +553,7 @@ _021E8D3E: ; jump table _021E8D4C: mov r0, #4 mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #0xc] mov r2, #0x10 mov r1, #0 @@ -669,7 +669,7 @@ _021E8E1C: _021E8E36: ldr r1, [r4, #0xc] mov r0, #4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit add r0, r6, #0 bl sub_0200621C mov r0, #1 @@ -820,7 +820,7 @@ _021E8F3C: ; jump table _021E8F48: mov r0, #4 mov r1, #0x1c - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #0xc] mov r2, #0x1c mov r1, #0 @@ -917,7 +917,7 @@ _021E8FFC: _021E9010: ldr r1, [r4, #0xc] mov r0, #4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit add r0, r6, #0 bl sub_0200621C mov r0, #1 @@ -955,7 +955,7 @@ _021E904C: ; jump table _021E9058: mov r0, #4 mov r1, #0x1c - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #0xc] mov r2, #0x1c mov r1, #0 @@ -1052,7 +1052,7 @@ _021E910C: _021E9120: ldr r1, [r4, #0xc] mov r0, #4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit add r0, r6, #0 bl sub_0200621C mov r0, #1 @@ -1095,7 +1095,7 @@ _021E916E: mov r1, #0x1e mov r0, #4 lsl r1, r1, #4 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x1e str r0, [r7, #0xc] mov r1, #0 @@ -1455,7 +1455,7 @@ _021E944E: bl ov05_021E37A4 ldr r1, [r7, #0xc] mov r0, #4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit ldr r0, [sp, #0x10] bl sub_0200621C _021E948A: @@ -1501,7 +1501,7 @@ _021E94D4: mov r1, #0x71 mov r0, #4 lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x71 str r0, [r6, #0xc] mov r1, #0 @@ -1812,7 +1812,7 @@ _021E974A: bl ov05_021E3A48 ldr r1, [r6, #0xc] mov r0, #4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit ldr r0, [sp, #0x10] bl sub_0200621C _021E9786: @@ -1861,7 +1861,7 @@ _021E97D6: mov r1, #0x7a mov r0, #4 lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x7a str r0, [r7, #0xc] mov r1, #0 @@ -2255,7 +2255,7 @@ _021E9AF0: bl ov05_021E3E44 ldr r1, [r7, #0xc] mov r0, #4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit ldr r0, [sp, #0x14] bl sub_0200621C add sp, #0x58 @@ -2318,7 +2318,7 @@ _021E9B98: mov r1, #9 mov r0, #4 lsl r1, r1, #6 - bl AllocFromHeap + bl Heap_Alloc ldr r1, [sp, #0x1c] mov r2, #9 str r0, [r1, #0xc] @@ -2844,7 +2844,7 @@ _021E9FA4: ldr r1, [sp, #0x1c] mov r0, #4 ldr r1, [r1, #0xc] - bl FreeToHeapExplicit + bl Heap_FreeExplicit ldr r0, [sp, #0x18] bl sub_0200621C add sp, #0x44 @@ -2977,7 +2977,7 @@ _021EA110: mov r1, #0x1f mov r0, #4 lsl r1, r1, #4 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x1f str r0, [r5, #0xc] mov r1, #0 @@ -3255,7 +3255,7 @@ _021EA354: bl ov05_021E3E44 ldr r1, [r5, #0xc] mov r0, #4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit add r0, r6, #0 bl sub_0200621C _021EA382: @@ -3307,7 +3307,7 @@ _021EA3D8: mov r1, #0x8a mov r0, #4 lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc ldr r1, [sp, #0x18] mov r2, #0x8a str r0, [r1, #0xc] @@ -3777,7 +3777,7 @@ _021EA76C: ldr r1, [sp, #0x18] mov r0, #4 ldr r1, [r1, #0xc] - bl FreeToHeapExplicit + bl Heap_FreeExplicit ldr r0, [sp, #0x14] bl sub_0200621C _021EA7DE: @@ -3894,7 +3894,7 @@ _021EA8B2: mov r1, #0x69 mov r0, #4 lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x69 str r0, [r4, #0xc] mov r1, #0 @@ -4133,7 +4133,7 @@ _021EAA98: bl ov05_021E3E44 ldr r1, [r4, #0xc] mov r0, #4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit add r0, r6, #0 bl sub_0200621C _021EAAC6: @@ -4180,7 +4180,7 @@ _021EAB14: mov r1, #0x1b mov r0, #4 lsl r1, r1, #4 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x1b str r0, [r6, #0xc] mov r1, #0 @@ -4442,7 +4442,7 @@ _021EAD1A: bl ov05_021E3E44 ldr r1, [r6, #0xc] mov r0, #4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit ldr r0, [sp, #0x10] bl sub_0200621C _021EAD4C: @@ -4487,7 +4487,7 @@ _021EAD8E: mov r1, #0x3d mov r0, #4 lsl r1, r1, #4 - bl AllocFromHeap + bl Heap_Alloc ldr r1, [sp, #0x14] mov r2, #0x3d str r0, [r1, #0xc] @@ -4817,7 +4817,7 @@ _021EB01A: ldr r1, [sp, #0x14] mov r0, #4 ldr r1, [r1, #0xc] - bl FreeToHeapExplicit + bl Heap_FreeExplicit ldr r0, [sp, #0x10] bl sub_0200621C _021EB04A: @@ -4976,7 +4976,7 @@ _021EB18E: mov r1, #0x6f mov r0, #4 lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x6f str r0, [r5, #0xc] mov r1, #0 @@ -5247,7 +5247,7 @@ _021EB394: strb r1, [r0] ldr r1, [r5, #0xc] mov r0, #4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit add r0, r6, #0 bl sub_0200621C _021EB3F2: @@ -5321,7 +5321,7 @@ _021EB466: ; jump table _021EB476: mov r0, #4 mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #0xc] mov r2, #0x10 mov r1, #0 @@ -5458,7 +5458,7 @@ _021EB56C: _021EB58A: ldr r1, [r4, #0xc] mov r0, #4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit add r0, r6, #0 bl sub_0200621C mov r0, #1 @@ -5503,7 +5503,7 @@ _021EB5D0: ; jump table _021EB5E4: mov r0, #4 mov r1, #0x38 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x38 str r0, [r4, #0xc] @@ -5669,7 +5669,7 @@ _021EB720: _021EB73E: ldr r1, [r4, #0xc] mov r0, #4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit add r0, r6, #0 bl sub_0200621C mov r0, #1 @@ -5722,7 +5722,7 @@ _021EB7A2: mov r1, #0x1f ldr r0, [sp, #0x14] lsl r1, r1, #4 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x1f str r0, [r5, #0xc] mov r1, #0 @@ -6167,7 +6167,7 @@ _021EBB60: str r0, [r2] ldr r1, [r5, #0xc] mov r0, #4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit add sp, #0x30 mov r0, #1 pop {r3, r4, r5, r6, r7, pc} @@ -6405,7 +6405,7 @@ _021EBD20: mov r1, #0x9b ldr r0, [sp, #0x10] lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x9b str r0, [r5, #0xc] mov r1, #0 @@ -7175,7 +7175,7 @@ _021EC37A: bl ov05_021E3E44 ldr r1, [r5, #0xc] mov r0, #4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit add sp, #0x4c mov r0, #1 pop {r4, r5, r6, r7, pc} diff --git a/arm9/overlays/05/asm/ov05_021EC458.s b/arm9/overlays/05/asm/ov05_021EC458.s index df0e6aa58..e084c0523 100644 --- a/arm9/overlays/05/asm/ov05_021EC458.s +++ b/arm9/overlays/05/asm/ov05_021EC458.s @@ -328,7 +328,7 @@ _021EC6FA: mov r1, #0 bl DaycareMon_SetSteps add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r7, #0 add sp, #0xc pop {r4, r5, r6, r7, pc} @@ -381,7 +381,7 @@ ov05_021EC744: ; 0x021EC744 bl CalcBoxMonLevel add r4, r0, #0 add r0, r7, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 pop {r3, r4, r5, r6, r7, pc} @@ -900,7 +900,7 @@ ov05_021ECB6C: ; 0x021ECB6C mov r0, #4 mov r1, #0xb4 str r2, [sp, #4] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r0, #0 add r1, r4, #0 @@ -1141,7 +1141,7 @@ _021ECD4A: blo _021ECCFE _021ECD54: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} nop @@ -1646,7 +1646,7 @@ _021ED168: add r0, r5, #0 bl ov05_021ECD64 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -2600,7 +2600,7 @@ _021ED7CE: ldr r0, [sp, #0x10] bl String_Delete add r0, r6, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x3c pop {r4, r5, r6, r7, pc} nop diff --git a/arm9/overlays/05/asm/ov05_021EDE34.s b/arm9/overlays/05/asm/ov05_021EDE34.s index 9ab1b01a6..6096f902b 100644 --- a/arm9/overlays/05/asm/ov05_021EDE34.s +++ b/arm9/overlays/05/asm/ov05_021EDE34.s @@ -229,7 +229,7 @@ ov05_021EDFBC: ; 0x021EDFBC _021EDFC4: ldr r1, _021EE03C ; =0x0000086C mov r0, #4 - bl AllocFromHeap + bl Heap_Alloc lsl r4, r6, #2 add r1, r5, r4 add r1, #0x90 @@ -298,7 +298,7 @@ ov05_021EE050: ; 0x021EE050 _021EE058: ldr r1, _021EE0B0 ; =0x0000086C mov r0, #4 - bl AllocFromHeap + bl Heap_Alloc lsl r4, r6, #2 add r1, r5, r4 add r1, #0x90 @@ -353,7 +353,7 @@ ov05_021EE0C0: ; 0x021EE0C0 beq _021EE0E6 mov r0, #4 mov r1, #0x10 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0 add r0, r6, #0 add r1, r7, #0 @@ -382,7 +382,7 @@ _021EE0FC: ldr r0, [r4, #0xc] str r0, [r5, #8] add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, r6, r7, pc} thumb_func_start ov05_021EE114 @@ -2821,7 +2821,7 @@ ov05_021EF368: ; 0x021EF368 lsl r1, r1, #2 str r2, [sp, #4] add r6, r3, #0 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x41 mov r1, #0 lsl r2, r2, #2 @@ -3074,7 +3074,7 @@ _021EF542: add r0, r5, r4 add r0, #0x90 ldr r0, [r0] - bl FreeToHeap + bl Heap_Free add r0, r5, r4 add r0, #0x90 str r7, [r0] @@ -3109,7 +3109,7 @@ ov05_021EF5A8: ; 0x021EF5A8 ldr r0, [r4] bl ov05_021F3C30 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .balign 4, 0 @@ -3710,7 +3710,7 @@ _021EF9EC: mov r1, #0 str r1, [r0] add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _021EF9FE: @@ -3728,7 +3728,7 @@ ov05_021EFA08: ; 0x021EFA08 mov r1, #0x28 add r6, r2, #0 add r7, r3, #0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r1, r0, #0 str r5, [r1] str r4, [r1, #4] diff --git a/arm9/overlays/05/asm/ov05_021EFBF8.s b/arm9/overlays/05/asm/ov05_021EFBF8.s index 69191de91..0581b0948 100644 --- a/arm9/overlays/05/asm/ov05_021EFBF8.s +++ b/arm9/overlays/05/asm/ov05_021EFBF8.s @@ -541,7 +541,7 @@ _021F000E: add r2, r6, #0 bl BufferPlayersName add r0, r6, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 mov r1, #0x24 bl ov05_021F01EC @@ -743,7 +743,7 @@ _021F01D4: add r0, r4, #0 bl ov05_021F0290 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free bl sub_02037778 mov r0, #1 pop {r3, r4, r5, pc} @@ -857,7 +857,7 @@ ov05_021F02C4: ; 0x021F02C4 ldr r5, [r6, #0x10] mov r0, #0xb mov r1, #0x94 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0 bl ov05_021F0254 str r6, [r4, #0x30] diff --git a/arm9/overlays/05/asm/ov05_021F0318.s b/arm9/overlays/05/asm/ov05_021F0318.s index a684fa557..038052058 100644 --- a/arm9/overlays/05/asm/ov05_021F0318.s +++ b/arm9/overlays/05/asm/ov05_021F0318.s @@ -149,7 +149,7 @@ ov05_021F043C: ; 0x021F043C add r5, r0, #0 mov r0, #4 mov r1, #0x60 - bl AllocFromHeap + bl Heap_Alloc add r1, r5, #0 add r4, r0, #0 bl ov05_021F0454 @@ -240,7 +240,7 @@ ov05_021F04F8: ; 0x021F04F8 bl GF_AssertFail _021F0508: ldr r0, [r4] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4] _021F0512: diff --git a/arm9/overlays/05/asm/ov05_021F1CB8.s b/arm9/overlays/05/asm/ov05_021F1CB8.s index eb47dcf34..b39075a35 100644 --- a/arm9/overlays/05/asm/ov05_021F1CB8.s +++ b/arm9/overlays/05/asm/ov05_021F1CB8.s @@ -197,11 +197,11 @@ ov05_021F1E2C: ; 0x021F1E2C cmp r5, #1 bne _021F1E4C mov r0, #4 - bl AllocFromHeap + bl Heap_Alloc b _021F1E52 _021F1E4C: mov r0, #4 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd _021F1E52: add r5, r0, #0 add r0, r6, #0 diff --git a/arm9/overlays/05/asm/ov05_021F1F04.s b/arm9/overlays/05/asm/ov05_021F1F04.s index 234eee981..6671651be 100644 --- a/arm9/overlays/05/asm/ov05_021F1F04.s +++ b/arm9/overlays/05/asm/ov05_021F1F04.s @@ -305,7 +305,7 @@ ov05_021F2160: ; 0x021F2160 add r7, r0, #0 mov r0, #4 mul r1, r6 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 add r0, r7, #0 add r0, #0xe4 @@ -316,7 +316,7 @@ ov05_021F2160: ; 0x021F2160 _021F2180: mov r0, #4 lsl r1, r6, #3 - bl AllocFromHeap + bl Heap_Alloc add r5, r0, #0 add r7, #0xf4 str r5, [r7] @@ -345,11 +345,11 @@ ov05_021F21AC: ; 0x021F21AC add r1, #0xe4 ldr r1, [r1] mov r0, #4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit add r4, #0xf4 ldr r1, [r4] mov r0, #4 - bl FreeToHeapExplicit + bl Heap_FreeExplicit pop {r4, pc} thumb_func_start ov05_021F21CC @@ -2837,7 +2837,7 @@ ov05_021F33B4: ; 0x021F33B4 ldr r1, [sp, #8] mov r0, #4 str r2, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021F33E2 bl GF_AssertFail @@ -2910,7 +2910,7 @@ ov05_021F3458: ; 0x021F3458 ldr r0, [r4, #0x24] bl SysTask_Destroy add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #1 mov r1, #0 lsl r0, r0, #8 @@ -2968,7 +2968,7 @@ ov05_021F34DC: ; 0x021F34DC str r0, [sp, #0x10] mov r0, #4 mov r1, #0x58 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0 mov r2, #0x58 add r5, r0, #0 @@ -3204,13 +3204,13 @@ _021F370A: ldr r0, [r5, #0x24] bl sub_0201F744 ldr r0, [r5, #8] - bl FreeToHeap + bl Heap_Free ldr r0, [r5, #0xc] - bl FreeToHeap + bl Heap_Free ldr r0, [r5, #0x10] - bl FreeToHeap + bl Heap_Free add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r6, #0 bl SysTask_Destroy pop {r4, r5, r6, pc} @@ -3237,13 +3237,13 @@ _021F3758: ldr r0, [r5, #0x24] bl sub_0201F744 ldr r0, [r5, #8] - bl FreeToHeap + bl Heap_Free ldr r0, [r5, #0xc] - bl FreeToHeap + bl Heap_Free ldr r0, [r5, #0x10] - bl FreeToHeap + bl Heap_Free add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r6, #0 bl SysTask_Destroy _021F377C: diff --git a/arm9/overlays/05/asm/ov05_021F3780.s b/arm9/overlays/05/asm/ov05_021F3780.s index 76c25cc7b..99a57ed69 100644 --- a/arm9/overlays/05/asm/ov05_021F3780.s +++ b/arm9/overlays/05/asm/ov05_021F3780.s @@ -31,7 +31,7 @@ ov05_021F379C: ; 0x021F379C ov05_021F37AC: ; 0x021F37AC push {r4, lr} mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021F37BC bl GF_AssertFail @@ -50,12 +50,12 @@ _021F37C2: thumb_func_start ov05_021F37D0 ov05_021F37D0: ; 0x021F37D0 - ldr r3, _021F37D8 ; =FreeToHeapExplicit + ldr r3, _021F37D8 ; =Heap_FreeExplicit add r1, r0, #0 ldr r0, [r1] bx r3 .balign 4, 0 -_021F37D8: .word FreeToHeapExplicit +_021F37D8: .word Heap_FreeExplicit thumb_func_start ov05_021F37DC ov05_021F37DC: ; 0x021F37DC @@ -86,7 +86,7 @@ _021F37FC: bne _021F37F0 ldr r0, [r5] ldr r1, [r5, #0xc] - bl FreeToHeapExplicit + bl Heap_FreeExplicit _021F380E: pop {r3, r4, r5, pc} @@ -100,7 +100,7 @@ ov05_021F3810: ; 0x021F3810 mul r5, r0 ldr r0, [r4] add r1, r5, #0 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #0xc] cmp r0, #0 bne _021F382E @@ -118,7 +118,7 @@ ov05_021F383C: ; 0x021F383C push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x5c] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 mov r1, #0 mov r2, #0x60 diff --git a/arm9/overlays/05/asm/ov05_021F3BC0.s b/arm9/overlays/05/asm/ov05_021F3BC0.s index 986f20b84..9750ad99d 100644 --- a/arm9/overlays/05/asm/ov05_021F3BC0.s +++ b/arm9/overlays/05/asm/ov05_021F3BC0.s @@ -9,7 +9,7 @@ ov05_021F3BC0: ; 0x021F3BC0 add r7, r0, #0 mov r0, #4 mov r1, #0x20 - bl AllocFromHeap + bl Heap_Alloc add r5, r0, #0 mov r4, #0 _021F3BD0: @@ -33,7 +33,7 @@ _021F3BEC: mov r1, #9 mov r0, #4 lsl r1, r1, #0xc - bl AllocFromHeap + bl Heap_Alloc str r0, [r6, #0x10] cmp r0, #0 bne _021F3C04 @@ -76,7 +76,7 @@ _021F3C38: ldr r0, [r5, #0x10] cmp r0, #0 beq _021F3C4C - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r5, #0x10] _021F3C4C: @@ -86,7 +86,7 @@ _021F3C4C: cmp r4, #4 blo _021F3C38 add r0, r6, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 diff --git a/arm9/overlays/05/asm/ov05_021F3FE0.s b/arm9/overlays/05/asm/ov05_021F3FE0.s index 7a0223a4d..a9cb382a7 100644 --- a/arm9/overlays/05/asm/ov05_021F3FE0.s +++ b/arm9/overlays/05/asm/ov05_021F3FE0.s @@ -408,7 +408,7 @@ _021F42EA: mov r1, #0 str r1, [r0] add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy pop {r3, r4, r5, pc} @@ -439,7 +439,7 @@ ov05_021F4328: ; 0x021F4328 push {r3, lr} mov r0, #4 mov r1, #0x20 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 str r1, [r0, #0x10] str r1, [r0, #0x14] @@ -458,7 +458,7 @@ ov05_021F4344: ; 0x021F4344 mov r0, #4 mov r1, #0x1c add r4, r2, #0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r6, r0, #0 add r0, r5, #0 add r1, r6, #0 @@ -495,7 +495,7 @@ ov05_021F4344: ; 0x021F4344 add r2, r6, #0 bl ov05_021F41F0 add r0, r6, #0 - bl FreeToHeap + bl Heap_Free mov r0, #1 str r0, [r4, #0x1c] pop {r4, r5, r6} @@ -509,7 +509,7 @@ ov05_021F43C0: ; 0x021F43C0 push {r3, lr} cmp r0, #0 beq _021F43CA - bl FreeToHeap + bl Heap_Free _021F43CA: pop {r3, pc} @@ -538,7 +538,7 @@ ov05_021F43E4: ; 0x021F43E4 mov r1, #0xb4 add r6, r2, #0 add r7, r3, #0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r1, r0, #0 add r2, r1, #0 mov r0, #0 diff --git a/arm9/overlays/05/asm/ov05_021F445C.s b/arm9/overlays/05/asm/ov05_021F445C.s index 988292fe2..a0c36d4f5 100644 --- a/arm9/overlays/05/asm/ov05_021F445C.s +++ b/arm9/overlays/05/asm/ov05_021F445C.s @@ -45,12 +45,12 @@ ov05_021F4498: ; 0x021F4498 add r5, r0, #0 add r0, r6, #0 mov r1, #8 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x18 add r4, r0, #0 add r0, r6, #0 mul r1, r5 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #4] mov r6, #0 str r5, [r4] @@ -107,9 +107,9 @@ ov05_021F450C: ; 0x021F450C push {r4, lr} add r4, r0, #0 ldr r0, [r4, #4] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .balign 4, 0 diff --git a/arm9/overlays/05/asm/ov05_021F45B4.s b/arm9/overlays/05/asm/ov05_021F45B4.s index e2439b1d0..7fb2da169 100644 --- a/arm9/overlays/05/asm/ov05_021F45B4.s +++ b/arm9/overlays/05/asm/ov05_021F45B4.s @@ -7,7 +7,7 @@ ov05_021F45B4: ; 0x021F45B4 push {r4, lr} mov r1, #0x1c - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bl ov05_021F4650 add r0, r4, #0 @@ -27,7 +27,7 @@ _021F45D8: add r0, r4, #0 bl ov05_021F4650 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _021F45E4: pop {r4, pc} .balign 4, 0 diff --git a/arm9/overlays/05/asm/ov05_021F46C8.s b/arm9/overlays/05/asm/ov05_021F46C8.s index 4b342ee55..22ba98409 100644 --- a/arm9/overlays/05/asm/ov05_021F46C8.s +++ b/arm9/overlays/05/asm/ov05_021F46C8.s @@ -10,7 +10,7 @@ ov05_021F46C8: ; 0x021F46C8 mov r1, #0xca lsl r1, r1, #2 add r6, r0, #0 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0xca mov r1, #0 lsl r2, r2, #2 @@ -47,7 +47,7 @@ _021F4712: ldr r0, [r4, r0] bl sub_02012974 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_start ov05_021F4724 diff --git a/arm9/overlays/05/asm/ov05_021F4968.s b/arm9/overlays/05/asm/ov05_021F4968.s index 15569e061..980d50677 100644 --- a/arm9/overlays/05/asm/ov05_021F4968.s +++ b/arm9/overlays/05/asm/ov05_021F4968.s @@ -11,7 +11,7 @@ ov05_021F4968: ; 0x021F4968 sub r1, r1, r0 bx r3 nop -_021F4974: .word ReallocFromHeap +_021F4974: .word Heap_Realloc thumb_func_start ov05_021F4978 ov05_021F4978: ; 0x021F4978 @@ -21,11 +21,11 @@ ov05_021F4978: ; 0x021F4978 add r5, r0, #0 mov r0, #4 lsl r1, r1, #6 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r0, #4 mov r1, #0x10 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd ldr r1, _021F49A8 ; =0x000008B8 mov r2, #0 str r0, [r4, r1] @@ -266,7 +266,7 @@ _021F4B70: bl ov05_021DB918 ldr r0, _021F4B9C ; =0x000008B8 ldr r0, [r5, r0] - bl FreeToHeap + bl Heap_Free ldr r0, _021F4B9C ; =0x000008B8 mov r1, #0 str r1, [r5, r0] @@ -331,7 +331,7 @@ _021F4C10: ldr r0, [r0, #4] cmp r0, #0 beq _021F4C1E - bl FreeToHeap + bl Heap_Free _021F4C1E: add r6, r6, #1 add r4, r4, #4 @@ -340,11 +340,11 @@ _021F4C1E: ldr r1, [r5] ldr r0, _021F4C6C ; =0x000008BC ldr r0, [r1, r0] - bl FreeToHeap + bl Heap_Free ldr r1, [r5] ldr r0, _021F4C70 ; =0x0000089C ldr r0, [r1, r0] - bl FreeToHeap + bl Heap_Free ldr r1, [r5] ldr r0, _021F4C70 ; =0x0000089C mov r2, #0 @@ -352,14 +352,14 @@ _021F4C1E: ldr r1, [r5] add r0, r0, #4 ldr r0, [r1, r0] - bl FreeToHeap + bl Heap_Free mov r0, #0x8a ldr r1, [r5] mov r2, #0 lsl r0, r0, #4 str r2, [r1, r0] ldr r0, [r5] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r5] pop {r3, r4, r5, r6, r7, pc} diff --git a/arm9/overlays/05/asm/ov05_021F4CF8.s b/arm9/overlays/05/asm/ov05_021F4CF8.s index 09121d081..c99c37500 100644 --- a/arm9/overlays/05/asm/ov05_021F4CF8.s +++ b/arm9/overlays/05/asm/ov05_021F4CF8.s @@ -8,7 +8,7 @@ ov05_021F4CF8: ; 0x021F4CF8 push {r4, lr} mov r0, #4 mov r1, #0xfc - bl AllocFromHeap + bl Heap_Alloc mov r4, #0 add r2, r4, #0 _021F4D06: @@ -29,7 +29,7 @@ ov05_021F4D1C: ; 0x021F4D1C push {r4, lr} add r4, r0, #0 ldr r0, [r4] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4] pop {r4, pc} @@ -690,7 +690,7 @@ _021F51E6: ldrb r1, [r4, #4] lsl r1, r1, #2 ldr r4, [r0, r1] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 pop {r3, r4, r5, pc} .balign 4, 0 diff --git a/arm9/overlays/05/asm/ov05_021F5268.s b/arm9/overlays/05/asm/ov05_021F5268.s index 24ad9abfb..fe1b6f46c 100644 --- a/arm9/overlays/05/asm/ov05_021F5268.s +++ b/arm9/overlays/05/asm/ov05_021F5268.s @@ -78,7 +78,7 @@ _021F52F8: ldr r0, [r4] cmp r0, #0 beq _021F5302 - bl FreeToHeap + bl Heap_Free _021F5302: mov r1, #0x10 mov r0, #0 @@ -140,7 +140,7 @@ ov05_021F5358: ; 0x021F5358 cmp r0, #0 bne _021F5376 ldr r0, [r4] - bl FreeToHeap + bl Heap_Free _021F5376: mov r1, #0x14 mov r0, #0 diff --git a/arm9/overlays/05/asm/ov05_021F5518.s b/arm9/overlays/05/asm/ov05_021F5518.s index 5661c68cb..5545aef38 100644 --- a/arm9/overlays/05/asm/ov05_021F5518.s +++ b/arm9/overlays/05/asm/ov05_021F5518.s @@ -151,7 +151,7 @@ ov05_021F5608: ; 0x021F5608 bl BG_LoadPlttData mov r0, #4 mov r1, #0x20 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x11 mov r2, #0x20 add r4, r0, #0 @@ -164,7 +164,7 @@ ov05_021F5608: ; 0x021F5608 mov r3, #0x20 bl BG_LoadCharTilesData add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r2, _021F565C ; =0x00006001 add r0, r5, #0 mov r1, #2 @@ -379,7 +379,7 @@ ov05_021F57D0: ; 0x021F57D0 str r0, [r4] _021F57E2: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .balign 4, 0 diff --git a/arm9/overlays/05/asm/ov05_021F5990.s b/arm9/overlays/05/asm/ov05_021F5990.s index bc1619d86..b687f2fe8 100644 --- a/arm9/overlays/05/asm/ov05_021F5990.s +++ b/arm9/overlays/05/asm/ov05_021F5990.s @@ -16,7 +16,7 @@ ov05_021F5990: ; 0x021F5990 str r0, [sp] add r7, r1, #0 str r3, [sp, #4] - bl CreateHeap + bl Heap_Create cmp r0, #1 beq _021F59B2 bl GF_AssertFail @@ -24,7 +24,7 @@ _021F59B2: sub r5, r6, r5 add r0, r7, #0 add r1, r5, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021F59C4 bl GF_AssertFail @@ -72,9 +72,9 @@ _021F5A06: _021F5A0E: ldr r4, [r6, #4] add r0, r6, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 - bl DestroyHeap + bl Heap_Destroy pop {r4, r5, r6, pc} .balign 4, 0 @@ -215,10 +215,10 @@ ov05_021F5B14: ; 0x021F5B14 cmp r2, #0 ldr r0, [r0, #4] bne _021F5B22 - bl AllocFromHeap + bl Heap_Alloc b _021F5B26 _021F5B22: - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd _021F5B26: add r4, r0, #0 cmp r4, #0 @@ -230,10 +230,10 @@ _021F5B30: thumb_func_start ov05_021F5B34 ov05_021F5B34: ; 0x021F5B34 - ldr r3, _021F5B38 ; =FreeToHeap + ldr r3, _021F5B38 ; =Heap_Free bx r3 .balign 4, 0 -_021F5B38: .word FreeToHeap +_021F5B38: .word Heap_Free thumb_func_start ov05_021F5B3C ov05_021F5B3C: ; 0x021F5B3C diff --git a/arm9/overlays/05/asm/ov05_021F5C44.s b/arm9/overlays/05/asm/ov05_021F5C44.s index 41dff0e80..28846904c 100644 --- a/arm9/overlays/05/asm/ov05_021F5C44.s +++ b/arm9/overlays/05/asm/ov05_021F5C44.s @@ -9,7 +9,7 @@ ov05_021F5C44: ; 0x021F5C44 add r0, r1, #0 mov r1, #0x18 add r5, r2, #0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0 add r2, r4, #0 mov r1, #0x18 @@ -94,7 +94,7 @@ _021F5CBA: add r1, r6, #0 bl sub_02046A20 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free mov r0, #0 pop {r3, r4, r5, r6, r7, pc} _021F5D10: @@ -105,7 +105,7 @@ _021F5D18: ldr r0, [r4, #0x34] bl MapObjectManager_UnpauseAllMovement add r0, r5, #0 - bl FreeToHeap + bl Heap_Free mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _021F5D28: @@ -152,7 +152,7 @@ ov05_021F5D68: ; 0x021F5D68 push {r4, lr} add r4, r0, #0 bl sub_0201B6C8 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl SysTask_Destroy pop {r4, pc} @@ -580,7 +580,7 @@ ov05_021F6074: ; 0x021F6074 add r5, r0, #0 mov r0, #4 add r1, r5, #0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0 bne _021F6088 bl GF_AssertFail diff --git a/arm9/overlays/05/asm/ov05_021F61F4.s b/arm9/overlays/05/asm/ov05_021F61F4.s index 0c8caf572..dc059bdba 100644 --- a/arm9/overlays/05/asm/ov05_021F61F4.s +++ b/arm9/overlays/05/asm/ov05_021F61F4.s @@ -10,7 +10,7 @@ ov05_021F61F4: ; 0x021F61F4 add r5, r0, #0 add r0, r6, #0 mov r1, #0x34 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0 mov r1, #0 mov r2, #0x34 @@ -46,7 +46,7 @@ ov05_021F6240: ; 0x021F6240 push {r4, lr} add r4, r0, #0 bl sub_0201B6C8 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl SysTask_Destroy pop {r4, pc} diff --git a/arm9/overlays/05/asm/ov05_021F6360.s b/arm9/overlays/05/asm/ov05_021F6360.s index 23603435f..474720730 100644 --- a/arm9/overlays/05/asm/ov05_021F6360.s +++ b/arm9/overlays/05/asm/ov05_021F6360.s @@ -35,7 +35,7 @@ _021F638E: ; jump table _021F639A: mov r0, #0xb mov r1, #8 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd str r0, [r6, #4] ldr r0, [r4] add r0, r0, #1 @@ -46,7 +46,7 @@ _021F63AC: add r6, r0, #0 mov r0, #0xb add r1, r6, #0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd str r0, [r5, #4] mov r1, #0 add r2, r6, #0 @@ -91,9 +91,9 @@ _021F6402: b _021F6424 _021F6414: add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r6, #0 - bl FreeToHeap + bl Heap_Free mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _021F6424: diff --git a/arm9/overlays/05/src/ov05_021E72FC.c b/arm9/overlays/05/src/ov05_021E72FC.c index 7b3138585..a38a6ef87 100644 --- a/arm9/overlays/05/src/ov05_021E72FC.c +++ b/arm9/overlays/05/src/ov05_021E72FC.c @@ -114,7 +114,7 @@ BOOL ov05_021E73B4(TaskManager *taskManager) { } UnkStruct021E7358 *ov05_021E74D4(u32 param0) { - UnkStruct021E7358 *res = (UnkStruct021E7358 *)AllocFromHeapAtEnd(HEAP_ID_4, param0); + UnkStruct021E7358 *res = (UnkStruct021E7358 *)Heap_AllocAtEnd(HEAP_ID_4, param0); if (res == NULL) { GF_AssertFail(); } @@ -123,5 +123,5 @@ UnkStruct021E7358 *ov05_021E74D4(u32 param0) { } void ov05_021E74F8(UnkStruct021E7358 *param0) { - FreeToHeapExplicit(HEAP_ID_4, param0); + Heap_FreeExplicit(HEAP_ID_4, param0); } diff --git a/arm9/overlays/06/asm/overlay_06.s b/arm9/overlays/06/asm/overlay_06.s index b5654673a..45d198824 100644 --- a/arm9/overlays/06/asm/overlay_06.s +++ b/arm9/overlays/06/asm/overlay_06.s @@ -352,7 +352,7 @@ _02239930: ldr r0, [r4] bl ov06_0223A44C add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #1 pop {r4, pc} _02239940: @@ -368,7 +368,7 @@ ov06_02239944: ; 0x02239944 add r4, r0, #0 mov r0, #4 mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc add r5, r0, #0 add r2, r5, #0 mov r1, #0x10 @@ -528,7 +528,7 @@ _02239A94: ldr r0, [r4] bl ov06_0223A44C add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #1 pop {r4, pc} _02239AA4: @@ -546,7 +546,7 @@ ov06_02239AAC: ; 0x02239AAC add r4, r0, #0 mov r0, #4 mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc add r5, r0, #0 add r2, r5, #0 mov r1, #0x10 @@ -1831,7 +1831,7 @@ ov06_0223A428: ; 0x0223A428 push {r3, r4, r5, lr} mov r1, #0x4c add r5, r0, #0 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x4c add r4, r0, #0 @@ -1851,7 +1851,7 @@ ov06_0223A44C: ; 0x0223A44C ldr r0, [r4] bl Camera_Delete add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 @@ -2119,7 +2119,7 @@ ov06_0223A640: ; 0x0223A640 ov06_0223A644: ; 0x0223A644 push {r4, lr} mov r1, #0x24 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x24 add r4, r0, #0 @@ -2142,7 +2142,7 @@ ov06_0223A660: ; 0x0223A660 str r0, [r4, #0x20] _0223A672: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 @@ -2270,7 +2270,7 @@ ov06_0223A75C: ; 0x0223A75C add r5, r0, #0 mov r0, #4 lsl r1, r1, #6 - bl AllocFromHeap + bl Heap_Alloc mov r2, #5 mov r1, #0 lsl r2, r2, #6 @@ -2285,7 +2285,7 @@ ov06_0223A75C: ; 0x0223A75C add r0, r4, r0 mov r1, #4 mov r2, #0x20 - bl GF_ExpHeap_FndInitAllocator + bl HeapExp_FndInitAllocator add r0, r4, #0 pop {r3, r4, r5, pc} @@ -2301,7 +2301,7 @@ ov06_0223A790: ; 0x0223A790 bl GF_AssertFail _0223A7A2: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 @@ -2948,7 +2948,7 @@ ov06_0223AC78: ; 0x0223AC78 mov r1, #5 lsl r1, r1, #6 add r5, r0, #0 - bl AllocFromHeap + bl Heap_Alloc mov r2, #5 add r4, r0, #0 mov r1, #0 @@ -2964,7 +2964,7 @@ ov06_0223AC78: ; 0x0223AC78 add r0, r4, r0 add r1, r5, #0 mov r2, #0x20 - bl GF_ExpHeap_FndInitAllocator + bl HeapExp_FndInitAllocator mov r2, #0x4f lsl r2, r2, #2 add r0, r4, #0 @@ -2986,7 +2986,7 @@ ov06_0223ACC0: ; 0x0223ACC0 add r0, #0x34 bl ov06_0223AFD0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_start ov06_0223ACD8 @@ -3631,7 +3631,7 @@ ov06_0223B19C: ; 0x0223B19C mov r1, #0x1e lsl r1, r1, #4 add r4, r0, #0 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x1e add r6, r0, #0 mov r1, #0 @@ -3677,7 +3677,7 @@ _0223B1EE: add r0, r6, #0 bl ov06_0223A3A4 add r0, r6, #0 - bl FreeToHeap + bl Heap_Free pop {r4, r5, r6, pc} .align 2, 0 @@ -4011,7 +4011,7 @@ ov06_0223B458: ; 0x0223B458 add r4, r1, #0 mov r1, #0xd4 add r7, r0, #0 - bl AllocFromHeap + bl Heap_Alloc add r6, r0, #0 mov r1, #0 mov r2, #0xd4 @@ -4020,7 +4020,7 @@ ov06_0223B458: ; 0x0223B458 add r0, #0xc4 add r1, r7, #0 mov r2, #0x20 - bl GF_ExpHeap_FndInitAllocator + bl HeapExp_FndInitAllocator add r0, r6, #0 add r0, #0x78 mov r1, #0x62 @@ -4093,7 +4093,7 @@ _0223B4FC: cmp r4, #3 blt _0223B4FC add r0, r7, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, r6, r7, pc} thumb_func_start ov06_0223B514 @@ -4420,7 +4420,7 @@ ov06_0223B71C: ; 0x0223B71C push {r4, lr} add r4, r1, #0 mov r1, #0x18 - bl AllocFromHeap + bl Heap_Alloc add r3, r0, #0 mov r2, #0x18 mov r1, #0 @@ -4436,10 +4436,10 @@ _0223B72C: thumb_func_start ov06_0223B73C ov06_0223B73C: ; 0x0223B73C - ldr r3, _0223B740 ; =FreeToHeap + ldr r3, _0223B740 ; =Heap_Free bx r3 .align 2, 0 -_0223B740: .word FreeToHeap +_0223B740: .word Heap_Free thumb_func_start ov06_0223B744 ov06_0223B744: ; 0x0223B744 @@ -4575,7 +4575,7 @@ ov06_0223B828: ; 0x0223B828 add r4, r1, #0 mov r1, #0xec add r7, r0, #0 - bl AllocFromHeap + bl Heap_Alloc add r6, r0, #0 mov r1, #0 mov r2, #0xec @@ -4587,7 +4587,7 @@ ov06_0223B828: ; 0x0223B828 add r0, #0xdc add r1, r7, #0 mov r2, #0x20 - bl GF_ExpHeap_FndInitAllocator + bl HeapExp_FndInitAllocator add r0, r6, #0 add r0, #0x78 mov r1, #0x62 @@ -4661,7 +4661,7 @@ _0223B8D4: cmp r4, #4 blt _0223B8D4 add r0, r7, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, r6, r7, pc} thumb_func_start ov06_0223B8EC @@ -4807,7 +4807,7 @@ _0223B9E8: ldr r1, [r0, r1] str r1, [r7] _0223B9F8: - bl FreeToHeap + bl Heap_Free _0223B9FC: pop {r3, r4, r5, r6, r7, pc} nop @@ -6734,7 +6734,7 @@ _0223C92E: bl GF_AssertFail _0223C95A: ldr r0, [sp, #0x1c] - bl FreeToHeap + bl Heap_Free add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -6828,7 +6828,7 @@ _0223C9E4: bl GF_AssertFail _0223CA1E: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x14 pop {r4, r5, r6, r7, pc} _0223CA28: @@ -6855,7 +6855,7 @@ _0223CA28: bl GF_AssertFail _0223CA5C: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x14 pop {r4, r5, r6, r7, pc} nop @@ -7708,7 +7708,7 @@ ov06_0223D044: ; 0x0223D044 bl GF_AssertFail _0223D0D8: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x18 pop {r3, r4, r5, r6, r7} pop {r3} @@ -8063,7 +8063,7 @@ _0223D374: ldrb r1, [r5, r1] mov r0, #0xb lsl r1, r1, #1 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x8a lsl r1, r1, #2 str r0, [r5, r1] @@ -8097,7 +8097,7 @@ ov06_0223D3B4: ; 0x0223D3B4 mov r1, #0x93 mov r0, #0xb lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x93 mov r1, #0 lsl r2, r2, #2 @@ -8750,9 +8750,9 @@ _0223D8F4: mov r0, #0x8a lsl r0, r0, #2 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #1 pop {r3, r4, r5, pc} _0223D908: @@ -11416,7 +11416,7 @@ ov06_0223EF18: ; 0x0223EF18 _0223EF28: mov r0, #4 mov r1, #0x9c - bl AllocFromHeap + bl Heap_Alloc ldr r1, _0223EFF4 ; =0x02252420 mov r2, #0x9c str r0, [r1] @@ -11526,7 +11526,7 @@ _0223F004: ldr r0, _0223F08C ; =0x02252420 ldr r0, [r0] ldr r0, [r0, #0x7c] - bl FreeToHeap + bl Heap_Free ldr r0, _0223F08C ; =0x02252420 ldr r0, [r0] ldr r0, [r0, #0x50] @@ -11574,7 +11574,7 @@ _0223F060: _0223F07A: ldr r0, _0223F08C ; =0x02252420 ldr r0, [r0] - bl FreeToHeap + bl Heap_Free ldr r0, _0223F08C ; =0x02252420 mov r1, #0 str r1, [r0] @@ -15565,7 +15565,7 @@ _0224113A: ldr r0, [r4, #0x6c] bl sub_0206BB74 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #1 pop {r4, pc} _0224117A: @@ -15583,7 +15583,7 @@ ov06_02241188: ; 0x02241188 add r5, r0, #0 mov r0, #0xb mov r1, #0x84 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0 mov r2, #0x84 add r4, r0, #0 @@ -15706,7 +15706,7 @@ CheckPastoriaGymButton: ; 0x02241230 add r5, r0, #0 mov r0, #0xb mov r1, #4 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r2, r0, #0 mov r0, #0 str r0, [r2] @@ -15891,7 +15891,7 @@ _022413F8: str r0, [r5] b _0224141E _02241414: - bl FreeToHeap + bl Heap_Free add sp, #0x10 mov r0, #1 pop {r3, r4, r5, r6, r7, pc} @@ -15982,7 +15982,7 @@ _022414C6: cmp r1, r0 bne _022414DA add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x28 mov r0, #1 pop {r3, r4, r5, r6, r7, pc} @@ -16063,7 +16063,7 @@ _02241558: str r0, [r5] b _02241580 _02241576: - bl FreeToHeap + bl Heap_Free add sp, #0x28 mov r0, #1 pop {r3, r4, r5, r6, r7, pc} @@ -16172,7 +16172,7 @@ _0224163E: str r0, [r5] b _02241666 _0224165C: - bl FreeToHeap + bl Heap_Free add sp, #0x10 mov r0, #1 pop {r3, r4, r5, r6, r7, pc} @@ -16494,7 +16494,7 @@ MoveHearthomeGymElevator: ; 0x02241914 add r5, r0, #0 mov r0, #0xb mov r1, #4 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r6, r0, #0 mov r0, #0 str r0, [r6] @@ -16616,7 +16616,7 @@ _02241A02: str r0, [r4] b _02241A32 _02241A28: - bl FreeToHeap + bl Heap_Free add sp, #0xc mov r0, #1 pop {r3, r4, r5, r6, pc} @@ -16712,7 +16712,7 @@ _02241ACE: str r0, [r4] b _02241AFC _02241AF2: - bl FreeToHeap + bl Heap_Free add sp, #0xc mov r0, #1 pop {r3, r4, r5, r6, pc} @@ -16827,7 +16827,7 @@ ov06_02241BB0: ; 0x02241BB0 str r0, [sp, #4] mov r0, #0xb mov r1, #4 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0 str r1, [r0] str r0, [sp] @@ -17264,7 +17264,7 @@ _02241F48: str r0, [r4] b _02241F68 _02241F5E: - bl FreeToHeap + bl Heap_Free add sp, #0xc mov r0, #1 pop {r4, r5, r6, r7, pc} @@ -17424,7 +17424,7 @@ _02242092: b _022420BC _022420B0: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x1c mov r0, #1 pop {r4, r5, r6, r7, pc} @@ -17587,7 +17587,7 @@ _022421E4: b _02242214 _02242208: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x1c mov r0, #1 pop {r4, r5, r6, r7, pc} @@ -17611,7 +17611,7 @@ ov06_02242224: ; 0x02242224 str r0, [sp, #0x10] mov r0, #4 mov r1, #0xf4 - bl AllocFromHeap + bl Heap_Alloc ldr r1, [r6, #4] add r2, sp, #0x50 str r0, [r1, #0x24] @@ -17865,7 +17865,7 @@ ov06_02242444: ; 0x02242444 add r4, r0, #0 ldr r0, [r4, #4] ldr r0, [r0, #0x24] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #4] mov r1, #0 str r1, [r0, #0x24] @@ -17996,7 +17996,7 @@ ov06_0224252C: ; 0x0224252C add r6, r0, #0 mov r0, #0xb mov r1, #4 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0 str r1, [r0] strb r4, [r5, #0x1c] @@ -18067,7 +18067,7 @@ ov06_022425C8: ; 0x022425C8 str r0, [sp, #0x10] mov r0, #4 mov r1, #0x58 - bl AllocFromHeap + bl Heap_Alloc ldr r1, [sp, #8] ldr r5, _0224268C ; =0x0224F8B8 ldr r1, [r1, #4] @@ -18163,7 +18163,7 @@ ov06_02242698: ; 0x02242698 add r4, r0, #0 ldr r0, [r4, #4] ldr r0, [r0, #0x24] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #4] mov r1, #0 str r1, [r0, #0x24] @@ -18368,7 +18368,7 @@ _02242808: b _0224283A _0224282E: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0xc mov r0, #1 pop {r4, r5, r6, r7, pc} @@ -18479,7 +18479,7 @@ ov06_022428D8: ; 0x022428D8 str r0, [sp, #0xc] mov r0, #4 mov r1, #0x1c - bl AllocFromHeap + bl Heap_Alloc ldr r1, [r5, #4] str r0, [r1, #0x24] ldr r0, [r5, #4] @@ -18579,7 +18579,7 @@ ov06_022429B0: ; 0x022429B0 add r4, r0, #0 ldr r0, [r4, #4] ldr r0, [r0, #0x24] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #4] mov r1, #0 str r1, [r0, #0x24] @@ -18661,7 +18661,7 @@ RotateSunyshoreGymGear: ; 0x02242A38 mov r1, #4 ldr r4, [r0, #0x24] mov r0, #0xb - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0 str r1, [r0] strh r5, [r4, #0x14] @@ -18856,7 +18856,7 @@ _02242BB8: str r1, [r0] b _02242BD6 _02242BCC: - bl FreeToHeap + bl Heap_Free add sp, #0x10 mov r0, #1 pop {r3, r4, r5, r6, r7, pc} @@ -18882,7 +18882,7 @@ ov06_02242BE0: ; 0x02242BE0 mov r1, #0x11 mov r0, #4 lsl r1, r1, #4 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _02242C0E bl GF_AssertFail @@ -19266,7 +19266,7 @@ _02242EFA: _02242F00: bl ov06_02243024 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #1 pop {r4, pc} _02242F0E: @@ -20061,10 +20061,10 @@ ov06_022434D0: ; 0x022434D0 mov r0, #3 mov r1, #0x3b lsl r2, r2, #0xe - bl CreateHeapAtEnd + bl Heap_CreateAtEnd ldr r1, _02243684 ; =0x000008CC mov r0, #0x3b - bl AllocFromHeap + bl Heap_Alloc ldr r2, _02243684 ; =0x000008CC mov r1, #0 add r4, r0, #0 @@ -20273,9 +20273,9 @@ _022436A6: mov r1, #0 bl MI_CpuFill8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 - bl DestroyHeap + bl Heap_Destroy _022436BE: pop {r3, r4, r5, pc} .align 2, 0 @@ -20319,7 +20319,7 @@ ov06_022436E8: ; 0x022436E8 bne _02243716 _02243706: ldr r0, [sp, #4] - bl FreeToHeap + bl Heap_Free ldr r1, [sp] mov r0, #0 str r0, [r1] @@ -20368,7 +20368,7 @@ _02243726: _0224376A: ldr r0, [sp] ldr r0, [r0] - bl FreeToHeap + bl Heap_Free ldr r0, [sp] mov r1, #0 str r1, [r0] @@ -21723,7 +21723,7 @@ ov06_02244190: ; 0x02244190 add r4, r1, #0 mov r1, #0xa8 str r2, [sp] - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0 mov r2, #0xa8 str r0, [sp, #4] @@ -21755,7 +21755,7 @@ _022441B8: mov r2, #0xa8 bl MI_CpuFill8 ldr r0, [sp, #4] - bl FreeToHeap + bl Heap_Free add sp, #8 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -22249,7 +22249,7 @@ _022445E8: blt _022445A6 _022445FA: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r7, #0 bl sub_020480E4 ldr r0, [r5, #4] @@ -22825,7 +22825,7 @@ ov06_02244A34: ; 0x02244A34 bl ov06_02244AEC add r4, r0, #0 add r0, r7, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} @@ -22880,7 +22880,7 @@ _02244AB0: cmp r7, #2 blt _02244AB0 ldr r0, [sp, #0x1c] - bl FreeToHeap + bl Heap_Free add sp, #0x24 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -23265,26 +23265,26 @@ _02244D8A: blt _02244D8A _02244DA4: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #8 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 thumb_func_start ov06_02244DB0 ov06_02244DB0: ; 0x02244DB0 - ldr r3, _02244DB8 ; =AllocFromHeapAtEnd + ldr r3, _02244DB8 ; =Heap_AllocAtEnd mov r1, #0x17 lsl r1, r1, #4 bx r3 .align 2, 0 -_02244DB8: .word AllocFromHeapAtEnd +_02244DB8: .word Heap_AllocAtEnd thumb_func_start ov06_02244DBC ov06_02244DBC: ; 0x02244DBC - ldr r3, _02244DC0 ; =FreeToHeap + ldr r3, _02244DC0 ; =Heap_Free bx r3 .align 2, 0 -_02244DC0: .word FreeToHeap +_02244DC0: .word Heap_Free thumb_func_start ov06_02244DC4 ov06_02244DC4: ; 0x02244DC4 @@ -23488,9 +23488,9 @@ _02244F3E: ldr r0, [r5, #0x38] bl sub_0201FD58 ldr r0, [r5, #0x20] - bl FreeToHeap + bl Heap_Free ldr r0, [r5, #0x24] - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, pc} thumb_func_start ov06_02244F64 @@ -23698,7 +23698,7 @@ ov06_02245114: ; 0x02245114 push {r3, r4, r5, r6, r7, lr} str r1, [sp] mov r1, #0x34 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r5, r0, #0 ldr r0, [sp] mov r1, #0xb @@ -23745,7 +23745,7 @@ _02245148: ldr r0, [r0] str r0, [r5, #0x30] add r0, r7, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 pop {r3, r4, r5, r6, r7, pc} nop @@ -23753,10 +23753,10 @@ _0224518C: .word 0x0000071D thumb_func_start ov06_02245190 ov06_02245190: ; 0x02245190 - ldr r3, _02245194 ; =FreeToHeap + ldr r3, _02245194 ; =Heap_Free bx r3 .align 2, 0 -_02245194: .word FreeToHeap +_02245194: .word Heap_Free thumb_func_start ov06_02245198 ov06_02245198: ; 0x02245198 @@ -23878,7 +23878,7 @@ ov06_0224525C: ; 0x0224525C add r4, r0, #0 mov r0, #4 mov r1, #0x14 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r5, r0, #0 add r2, r5, #0 mov r1, #0x14 @@ -24125,7 +24125,7 @@ _0224544C: strb r0, [r4, #5] b _02245468 _0224545E: - bl FreeToHeap + bl Heap_Free add sp, #0x24 mov r0, #1 pop {r4, r5, r6, r7, pc} @@ -24410,7 +24410,7 @@ _02245672: ldr r2, [r0, r2] ldr r1, [sp, #0x18] str r2, [r1] - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -25066,19 +25066,19 @@ _02245B34: mov r0, #0x51 lsl r0, r0, #2 ldr r0, [r5, r0] - bl FreeToHeap + bl Heap_Free mov r0, #0x52 lsl r0, r0, #2 ldr r0, [r5, r0] - bl FreeToHeap + bl Heap_Free mov r0, #0x53 lsl r0, r0, #2 ldr r0, [r5, r0] - bl FreeToHeap + bl Heap_Free mov r0, #0x15 lsl r0, r0, #4 ldr r0, [r5, r0] - bl FreeToHeap + bl Heap_Free ldr r0, [r5, #8] bl sub_0201FDB4 ldr r0, [r5, #8] @@ -26567,7 +26567,7 @@ ov06_022466C0: ; 0x022466C0 add r5, r0, #0 mov r0, #4 lsl r1, r1, #2 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r2, #0x87 mov r1, #0 lsl r2, r2, #2 @@ -26579,10 +26579,10 @@ ov06_022466C0: ; 0x022466C0 thumb_func_start ov06_022466E0 ov06_022466E0: ; 0x022466E0 - ldr r3, _022466E4 ; =FreeToHeap + ldr r3, _022466E4 ; =Heap_Free bx r3 .align 2, 0 -_022466E4: .word FreeToHeap +_022466E4: .word Heap_Free thumb_func_start ov06_022466E8 ov06_022466E8: ; 0x022466E8 @@ -27620,7 +27620,7 @@ _02246E60: ldr r0, [r6, r0] cmp r0, #0 beq _02246E7E - bl FreeToHeap + bl Heap_Free mov r0, #0x83 mov r1, #0 lsl r0, r0, #2 @@ -27631,7 +27631,7 @@ _02246E7E: ldr r0, [r6, r0] cmp r0, #0 beq _02246E94 - bl FreeToHeap + bl Heap_Free mov r0, #0x21 mov r1, #0 lsl r0, r0, #4 @@ -28498,7 +28498,7 @@ ov06_02247544: ; 0x02247544 lsl r3, r0, #7 bl BG_LoadPlttData add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, pc} thumb_func_start ov06_0224756C @@ -28523,7 +28523,7 @@ ov06_0224756C: ; 0x0224756C mov r1, #3 bl BG_LoadCharTilesData add r0, r6, #0 - bl FreeToHeap + bl Heap_Free add sp, #4 pop {r3, r4, r5, r6, pc} .align 2, 0 @@ -28573,7 +28573,7 @@ ov06_022475A4: ; 0x022475A4 mov r1, #3 bl BgCommitTilemapBufferToVram add r0, r6, #0 - bl FreeToHeap + bl Heap_Free add sp, #0xc pop {r4, r5, r6, r7, pc} @@ -28802,7 +28802,7 @@ ov06_0224778C: ; 0x0224778C mov r0, #4 lsl r1, r1, #6 add r7, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _022477A8 bl GF_AssertFail @@ -30411,7 +30411,7 @@ ov06_022483EC: ; 0x022483EC push {r4, lr} add r4, r0, #0 bl sub_0201B6C8 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl SysTask_Destroy pop {r4, pc} @@ -30694,7 +30694,7 @@ ov06_02248630: ; 0x02248630 ov06_02248634: ; 0x02248634 push {r3, r4, r5, lr} add r5, r1, #0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0 bne _02248644 bl GF_AssertFail @@ -30977,7 +30977,7 @@ NPCTradeApp_Init: ; 0x0224884C _0224885C: add r0, r5, #0 mov r1, #0x14 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 add r2, r4, #0 mov r1, #0x14 @@ -31028,13 +31028,13 @@ NPCTradeApp_Delete: ; 0x022488CC push {r4, lr} add r4, r0, #0 ldr r0, [r4] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #4] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #8] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 @@ -31157,7 +31157,7 @@ _022489D0: .word 0x00000146 thumb_func_start CreateInGameTradeMon CreateInGameTradeMon: ; 0x022489D4 - ; void CreateInGameTradeMon(struct Pokemon * mon, struct InGameTrade * trade, u32 level, u32 name_idx, HeapID heapId) + ; void CreateInGameTradeMon(struct Pokemon * mon, struct InGameTrade * trade, u32 level, u32 name_idx, enum HeapID heapID) push {r4, r5, r6, r7, lr} sub sp, #0x14 add r6, r3, #0 @@ -31379,7 +31379,7 @@ ov06_02248B70: ; 0x02248B70 add r5, r1, #0 mov r0, #4 mov r1, #0x18 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bl ov06_02248B0C add r0, r5, #0 @@ -31415,7 +31415,7 @@ ov06_02248BC0: ; 0x02248BC0 add r5, r0, #0 mov r0, #4 mov r1, #0x18 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bl ov06_02248B0C add r0, r5, #0 @@ -31451,7 +31451,7 @@ ov06_02248C18: ; 0x02248C18 add r6, r0, #0 mov r0, #4 mov r1, #0x18 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bl ov06_02248B0C add r0, r6, #0 @@ -31516,10 +31516,10 @@ _02248CA4: thumb_func_start ov06_02248CB8 ov06_02248CB8: ; 0x02248CB8 - ldr r3, _02248CBC ; =FreeToHeap + ldr r3, _02248CBC ; =Heap_Free bx r3 .align 2, 0 -_02248CBC: .word FreeToHeap +_02248CBC: .word Heap_Free thumb_func_start ov06_02248CC0 ov06_02248CC0: ; 0x02248CC0 @@ -38536,7 +38536,7 @@ CallTask_PokecenterAnimation: ; 0x0224C27C beq _0224C2E8 mov r0, #4 mov r1, #0x18 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0 strb r6, [r4, #0xc] mov r0, #0 @@ -38824,7 +38824,7 @@ _0224C4EE: strb r0, [r4, #0xf] b _0224C500 _0224C4F6: - bl FreeToHeap + bl Heap_Free add sp, #0x38 mov r0, #1 pop {r3, r4, r5, r6, r7, pc} @@ -38854,7 +38854,7 @@ ov06_0224C520: ; 0x0224C520 beq _0224C552 mov r0, #4 add r1, r0, #0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r2, r0, #0 strb r6, [r2] strb r4, [r2, #1] @@ -38990,7 +38990,7 @@ _0224C648: strb r0, [r4, #2] b _0224C664 _0224C65A: - bl FreeToHeap + bl Heap_Free add sp, #0x1c mov r0, #1 pop {r4, r5, r6, r7, pc} @@ -39113,7 +39113,7 @@ _0224C732: cmp r4, #2 bne _0224C74E add r0, r5, #0 - bl FreeToHeap + bl Heap_Free _0224C74E: cmp r4, #1 beq _0224C732 @@ -39340,7 +39340,7 @@ _0224C8FC: add r1, r4, #0 bl ov06_0224C92C add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _0224C920: @@ -39565,7 +39565,7 @@ _0224CABE: cmp r4, #2 bne _0224CADA add r0, r5, #0 - bl FreeToHeap + bl Heap_Free _0224CADA: cmp r4, #1 beq _0224CABE @@ -39654,7 +39654,7 @@ _0224CB66: cmp r4, #2 bne _0224CB82 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free _0224CB82: cmp r4, #1 beq _0224CB66 @@ -39667,7 +39667,7 @@ _0224CB8C: .word ov06_02251E28 ov06_0224CB90: ; 0x0224CB90 push {r3, r4, r5, lr} add r5, r1, #0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0 bne _0224CBA0 bl GF_AssertFail @@ -39734,7 +39734,7 @@ _0224CC02: add r1, r5, #0 bl sub_0202ABA0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #8 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -39763,7 +39763,7 @@ _0224CC40: ldrh r1, [r1, #2] lsl r1, r1, #2 ldr r4, [r0, r1] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 add sp, #4 pop {r3, r4, pc} @@ -39922,7 +39922,7 @@ _0224CD7E: blo _0224CD70 _0224CD88: ldr r0, [sp, #0xc] - bl FreeToHeap + bl Heap_Free ldr r0, [sp, #4] add sp, #0x4c pop {r4, r5, r6, r7, pc} @@ -39946,7 +39946,7 @@ ov06_0224CDA0: ; 0x0224CDA0 bl AllocAtEndAndReadWholeNarcMemberByIdPair ldr r1, [r0] str r1, [r4] - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_start ov06_0224CDB8 @@ -40777,7 +40777,7 @@ ov06_0224D3E8: ; 0x0224D3E8 add r5, r0, #0 mov r0, #0xb mov r1, #8 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0 mov r2, #8 add r4, r0, #0 @@ -40828,7 +40828,7 @@ _0224D442: str r0, [r4, #4] b _0224D462 _0224D45A: - bl FreeToHeap + bl Heap_Free mov r0, #1 pop {r3, r4, r5, pc} _0224D462: @@ -40849,7 +40849,7 @@ ov06_0224D46C: ; 0x0224D46C str r0, [sp, #0x1c] mov r0, #0xb mov r1, #0x18 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x18 add r4, r0, #0 @@ -41101,7 +41101,7 @@ ov06_0224D6A4: ; 0x0224D6A4 ldr r0, [r4, #0x14] bl MessageFormat_Delete add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 @@ -41148,7 +41148,7 @@ ov06_0224D70C: ; 0x0224D70C lsl r1, r1, #2 add r5, r0, #0 add r7, r2, #0 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0xc1 add r4, r0, #0 mov r1, #0 @@ -41200,7 +41200,7 @@ ov06_0224D76C: ; 0x0224D76C lsl r2, r2, #2 bl memset add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 @@ -42935,7 +42935,7 @@ ov06_0224E554: ; 0x0224E554 beq _0224E5C0 mov r0, #4 mov r1, #0x18 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0 strb r6, [r4, #0xc] mov r0, #0 @@ -43164,7 +43164,7 @@ _0224E73A: strb r0, [r4, #0xf] b _0224E74C _0224E742: - bl FreeToHeap + bl Heap_Free add sp, #0x30 mov r0, #1 pop {r4, r5, r6, pc} @@ -43590,7 +43590,7 @@ ov06_0224EA64: ; 0x0224EA64 add r0, #0xdc mov r1, #4 mov r2, #0x20 - bl GF_ExpHeap_FndInitAllocator + bl HeapExp_FndInitAllocator add r0, r4, #0 add r0, #0xdc mov r1, #3 @@ -43704,7 +43704,7 @@ ov06_0224EB30: ; 0x0224EB30 add r0, #0xdc mov r1, #4 mov r2, #0x20 - bl GF_ExpHeap_FndInitAllocator + bl HeapExp_FndInitAllocator add r0, r4, #0 add r0, #0xdc mov r2, #4 @@ -43738,7 +43738,7 @@ ov06_0224EB78: ; 0x0224EB78 add r0, #0xdc mov r1, #4 mov r2, #0x20 - bl GF_ExpHeap_FndInitAllocator + bl HeapExp_FndInitAllocator add r0, r4, #0 add r0, #0xdc mov r2, #4 @@ -43878,7 +43878,7 @@ ov06_0224EC5C: ; 0x0224EC5C add r0, r0, r1 mov r1, #4 mov r2, #0x20 - bl GF_ExpHeap_FndInitAllocator + bl HeapExp_FndInitAllocator ldr r5, [sp, #8] mov r1, #0x6e add r4, sp, #0x10 @@ -44299,7 +44299,7 @@ ov06_0224EF98: ; 0x0224EF98 mov r1, #4 add r0, r5, r0 mov r2, #0x20 - bl GF_ExpHeap_FndInitAllocator + bl HeapExp_FndInitAllocator add r0, r5, #0 mov r1, #0x8d mov r2, #8 @@ -44379,7 +44379,7 @@ _0224F038: lsl r6, r6, #4 _0224F054: ldr r0, [r5, r6] - bl FreeToHeap + bl Heap_Free add r4, r4, #1 add r5, r5, #4 cmp r4, #4 @@ -44489,7 +44489,7 @@ _0224F102: mov r1, #1 strh r1, [r0] add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _0224F120: @@ -44506,7 +44506,7 @@ ov06_0224F12C: ; 0x0224F12C add r0, r3, #0 mov r1, #0x10 add r4, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r6, r0, #0 add r2, r6, #0 mov r1, #0x10 diff --git a/arm9/overlays/07/asm/overlay_07.s b/arm9/overlays/07/asm/overlay_07.s index 02d395439..78d801654 100644 --- a/arm9/overlays/07/asm/overlay_07.s +++ b/arm9/overlays/07/asm/overlay_07.s @@ -1992,7 +1992,7 @@ ov07_02212E64: ; 0x02212E64 mov r1, #1 bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_start ov07_02212E90 @@ -3023,7 +3023,7 @@ ov07_022136B4: ; 0x022136B4 mov r1, #0x12 ldr r0, [r0, #0x24] lsl r1, r1, #0xa - bl AllocFromHeap + bl Heap_Alloc mov r2, #0xb6 lsl r2, r2, #4 str r0, [r4, r2] @@ -3142,7 +3142,7 @@ ov07_022137DC: ; 0x022137DC mov r0, #0xb6 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free ldr r0, _0221380C ; =0x00000B58 ldr r0, [r4, r0] bl sub_020223BC @@ -3280,7 +3280,7 @@ ov07_022138F8: ; 0x022138F8 mov r1, #1 bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_start ov07_02213924 @@ -3336,7 +3336,7 @@ ov07_02213924: ; 0x02213924 mov r2, #0x60 bl memcpy add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r5] mov r2, #0xa9 lsl r2, r2, #2 @@ -5053,7 +5053,7 @@ ov07_02214720: ; 0x02214720 str r0, [sp, #0x10] ldr r0, [r4, #0x24] mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc add r5, r0, #0 add r0, r7, #0 bl sub_020313CC @@ -5070,7 +5070,7 @@ ov07_02214720: ; 0x02214720 bl sub_020294B4 add r6, r0, #0 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free b _0221493A _0221479C: bl sub_02033534 @@ -5105,7 +5105,7 @@ _022147BC: str r0, [sp, #0x14] ldr r0, [r4, #0x24] mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc add r5, r0, #0 add r0, r7, #0 bl sub_020313CC @@ -5122,7 +5122,7 @@ _022147BC: bl sub_0202930C add r6, r0, #0 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free b _0221493A _02214808: mov r0, #1 @@ -5138,7 +5138,7 @@ _02214808: str r0, [sp, #0x18] ldr r0, [r4, #0x24] mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc add r5, r0, #0 add r0, r7, #0 bl sub_020313CC @@ -5155,7 +5155,7 @@ _02214808: bl sub_0202934C add r6, r0, #0 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free b _0221493A _02214854: mov r0, #1 @@ -5171,7 +5171,7 @@ _02214854: str r0, [sp, #0x1c] ldr r0, [r4, #0x24] mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc add r5, r0, #0 add r0, r7, #0 bl sub_020313CC @@ -5188,16 +5188,16 @@ _02214854: bl sub_020293EC add r6, r0, #0 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free b _0221493A _022148A0: ldr r0, [r4, #0x24] mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc add r5, r0, #0 ldr r0, [r4, #0x24] mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc add r7, r0, #0 bl ov07_02212BD4 cmp r0, #1 @@ -5250,9 +5250,9 @@ _02214914: bl sub_0202938C add r6, r0, #0 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r7, #0 - bl FreeToHeap + bl Heap_Free b _0221493A _02214936: add sp, #0x20 diff --git a/arm9/overlays/08/asm/overlay_08.s b/arm9/overlays/08/asm/overlay_08.s index 7b588f50d..2f56d45ae 100644 --- a/arm9/overlays/08/asm/overlay_08.s +++ b/arm9/overlays/08/asm/overlay_08.s @@ -157,7 +157,7 @@ ov08_02211F5C: ; 0x02211F5C mov r1, #0x69 lsl r1, r1, #2 add r5, r0, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _02211F78 cmp r4, #0 @@ -177,7 +177,7 @@ _02211F78: str r0, [r4, #8] ldr r0, [r4] lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc add r1, r4, #0 add r1, #0xc0 str r0, [r1] @@ -276,9 +276,9 @@ _02212034: add r0, r4, #0 add r0, #0xc0 ldr r0, [r0] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #1 pop {r4, pc} @@ -742,7 +742,7 @@ _022123BE: mov r0, #0 pop {r3, pc} _022123C2: - bl FreeToHeap + bl Heap_Free mov r0, #1 pop {r3, pc} .align 2, 0 @@ -982,7 +982,7 @@ ov08_0221252C: ; 0x0221252C add r5, r0, #0 ldr r0, [r5] mov r1, #0x3c - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _02212544 bl GF_AssertFail @@ -1040,7 +1040,7 @@ ov08_02212574: ; 0x02212574 strh r1, [r0] _022125A2: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _022125AE: @@ -3078,7 +3078,7 @@ ov08_02213454: ; 0x02213454 mov r0, #0x5e lsl r0, r0, #2 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free mov r0, #0x5e mov r1, #0 lsl r0, r0, #2 @@ -3095,7 +3095,7 @@ _02213480: ldr r0, [r0, #0xc] bl SysTask_Destroy ldr r0, [r4, r5] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, r5] _0221349E: @@ -3203,7 +3203,7 @@ _02213500: bne _022135AC ldr r0, [r5] mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x5e lsl r1, r1, #2 str r0, [r5, r1] @@ -3681,7 +3681,7 @@ _0221393A: add r6, r4, r0 ldr r0, [r4] mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc str r0, [r6, r5] ldr r0, [r6, r5] ldr r1, [sp, #0x1c] @@ -4268,7 +4268,7 @@ ov08_02213DA8: ; 0x02213DA8 add r5, r0, #0 ldr r0, [r5] mov r1, #0x4c - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _02213DC0 bl GF_AssertFail @@ -5182,7 +5182,7 @@ ov08_022144C0: ; 0x022144C0 cmp r0, #1 bne _022144DA add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy pop {r3, r4, r5, pc} @@ -5262,7 +5262,7 @@ ov08_0221454C: ; 0x0221454C ldr r0, [r5, #0x48] mov r1, #0x20 ldr r0, [r0] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 ldr r0, [r5, #0x48] mov r2, #6 @@ -5348,11 +5348,11 @@ ov08_022145F8: ; 0x022145F8 str r0, [sp] ldr r0, [r4] mov r1, #0x20 - bl AllocFromHeap + bl Heap_Alloc add r6, r0, #0 ldr r0, [r4] mov r1, #0xc4 - bl AllocFromHeap + bl Heap_Alloc str r0, [r6, #0x1c] mov r0, #6 lsl r0, r0, #6 @@ -5470,9 +5470,9 @@ ov08_022146E4: ; 0x022146E4 ldr r0, [r4] bl ov08_02218870 ldr r0, [r5, #0x1c] - bl FreeToHeap + bl Heap_Free add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r6, #0 bl SysTask_Destroy add sp, #8 @@ -5727,7 +5727,7 @@ ov08_022148E0: ; 0x022148E0 lsl r0, r0, #2 strb r2, [r1, r0] add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _0221490A: @@ -7628,7 +7628,7 @@ ov08_022156C0: ; 0x022156C0 stmia r2!, {r0, r1} add r0, r5, #0 mov r1, #0x58 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 str r5, [r4] str r6, [r4, #4] @@ -7925,7 +7925,7 @@ _0221593C: cmp r6, #4 blt _02215920 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free pop {r4, r5, r6, pc} thumb_func_start ov08_0221594C @@ -7955,7 +7955,7 @@ _02215976: cmp r4, #4 blt _02215956 add r0, r6, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -7979,7 +7979,7 @@ ov08_0221599C: ; 0x0221599C mov r1, #0x12 lsl r1, r1, #0xa add r4, r0, #0 - bl AllocFromHeap + bl Heap_Alloc add r2, r0, #0 mov r0, #1 str r0, [sp] @@ -8013,7 +8013,7 @@ ov08_022159E4: ; 0x022159E4 mov r1, #0x42 lsl r1, r1, #8 add r4, r0, #0 - bl AllocFromHeap + bl Heap_Alloc add r2, r0, #0 mov r0, #1 str r0, [sp] @@ -8049,7 +8049,7 @@ ov08_02215A2C: ; 0x02215A2C add r0, r5, #0 bl sub_02012DE4 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, pc} thumb_func_start ov08_02215A44 @@ -11152,7 +11152,7 @@ ov08_022171CC: ; 0x022171CC add r5, r0, #0 bl ov08_02212014 mov r1, #0x38 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 str r5, [r4] add r0, r5, #0 @@ -11222,7 +11222,7 @@ _0221726C: add r1, r4, #0 bl ov08_022164C8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, r5, r6, pc} thumb_func_start ov08_0221727C @@ -14192,7 +14192,7 @@ ov08_022187F4: ; 0x022187F4 add r5, r0, #0 ldr r1, _02218864 ; =0x00000624 add r0, r7, #0 - bl AllocFromHeap + bl Heap_Alloc ldr r2, _02218864 ; =0x00000624 mov r1, #0 add r4, r0, #0 @@ -14255,7 +14255,7 @@ _0221887A: bl sub_02012974 _0221888A: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 @@ -14312,7 +14312,7 @@ ov08_022188DC: ; 0x022188DC mov r1, #0x20 str r2, [sp, #0x18] add r5, r3, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _022188F8 bl GF_AssertFail @@ -14369,7 +14369,7 @@ _02218956: bl sub_02012B00 _02218966: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 @@ -14622,7 +14622,7 @@ _02218B12: ldr r0, [r4, #4] bl SysTask_Destroy add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_start ov08_02218B20 @@ -14633,7 +14633,7 @@ ov08_02218B20: ; 0x02218B20 mov r1, #0x1c add r6, r2, #0 add r7, r3, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _02218B38 bl GF_AssertFail @@ -14832,7 +14832,7 @@ _02218C8C: add r1, r2, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_start ov08_02218C9C @@ -14841,7 +14841,7 @@ ov08_02218C9C: ; 0x02218C9C add r4, r0, #0 mov r0, #5 mov r1, #8 - bl AllocFromHeap + bl Heap_Alloc add r2, r0, #0 mov r0, #0 strb r0, [r2] @@ -14875,7 +14875,7 @@ _02218CDC: add r1, r2, #0 bl ov08_02212448 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_start ov08_02218CEC @@ -14884,7 +14884,7 @@ ov08_02218CEC: ; 0x02218CEC add r4, r0, #0 mov r0, #5 mov r1, #8 - bl AllocFromHeap + bl Heap_Alloc add r2, r0, #0 mov r0, #0 strb r0, [r2] @@ -14915,7 +14915,7 @@ _02218D24: _02218D2A: bl SysTask_Destroy add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 @@ -14925,7 +14925,7 @@ ov08_02218D38: ; 0x02218D38 add r4, r0, #0 mov r0, #5 mov r1, #8 - bl AllocFromHeap + bl Heap_Alloc add r1, r0, #0 mov r0, #0 strb r0, [r1] @@ -14983,7 +14983,7 @@ _02218DB4: ldr r4, [r5, #4] bl sub_0200C3DC add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 add r1, r6, #0 bl ov08_02212438 @@ -15000,7 +15000,7 @@ ov08_02218DCC: ; 0x02218DCC lsl r1, r1, #2 add r7, r2, #0 add r5, r3, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _02218DEA bl GF_AssertFail @@ -15191,7 +15191,7 @@ _02218F4E: add r1, r2, #0 bl ov08_02212438 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free _02218F5C: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -15382,7 +15382,7 @@ _022190B2: add r1, r5, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, pc} _022190CA: mov r1, #0x10 @@ -15783,7 +15783,7 @@ _022193DA: add r1, r5, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, pc} _022193F2: mov r1, #0x10 @@ -16119,7 +16119,7 @@ _02219688: add r1, r5, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, pc} .align 2, 0 @@ -16129,7 +16129,7 @@ ov08_022196B8: ; 0x022196B8 add r5, r0, #0 bl ov08_02212014 mov r1, #0x2c - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r0, #0 strb r0, [r4] @@ -16257,7 +16257,7 @@ ov08_02219794: ; 0x02219794 add r1, r5, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _022197E0: pop {r3, r4, r5, pc} .align 2, 0 @@ -16268,7 +16268,7 @@ ov08_022197E4: ; 0x022197E4 add r5, r0, #0 bl ov08_02212014 mov r1, #0x30 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 add r0, r5, #0 mov r1, #0 @@ -16545,7 +16545,7 @@ _02219A0C: add r1, r5, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, pc} _02219A22: ldr r0, [r4, #8] @@ -16623,7 +16623,7 @@ ov08_02219AB8: ; 0x02219AB8 cmp r0, #0 bne _02219AD6 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4] add r1, r5, #0 bl ov08_02212438 @@ -16795,7 +16795,7 @@ _02219C14: pop {r3, r4, r5, pc} _02219C1A: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4] add r1, r5, #0 bl ov08_02212438 @@ -17009,7 +17009,7 @@ _02219DA8: cmp r0, #0 bne _02219DB6 add r0, r6, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, r6, r7, pc} _02219DB6: add r0, r4, #0 @@ -17211,7 +17211,7 @@ _02219F48: b _02219F60 _02219F4E: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4] add r1, r5, #0 bl ov08_02212438 @@ -17514,7 +17514,7 @@ _0221A1C8: ldr r0, [r4, #0xc] bl ov08_02218E34 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4] add r1, r5, #0 bl ov08_02212438 @@ -17718,7 +17718,7 @@ _0221A346: cmp r0, #0 bne _0221A356 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x54 pop {r4, r5, r6, r7, pc} _0221A356: @@ -17795,7 +17795,7 @@ ov08_0221A3EC: ; 0x0221A3EC cmp r0, #0 beq _0221A40E add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4] add r1, r5, #0 bl ov08_02212438 @@ -17945,7 +17945,7 @@ ov08_0221A518: ; 0x0221A518 mov r2, #0 bl sub_02007558 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x3c] add r1, r5, #0 bl ov08_02212438 @@ -18071,7 +18071,7 @@ _0221A632: add r1, r2, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #8 pop {r4, pc} @@ -18157,7 +18157,7 @@ _0221A6EA: cmp r6, #0xff bne _0221A6F6 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, r5, r6, pc} _0221A6F6: add r1, r4, #0 @@ -18264,7 +18264,7 @@ _0221A7BC: add r1, r2, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #8 pop {r4, pc} .align 2, 0 @@ -18358,7 +18358,7 @@ _0221A886: cmp r6, #0xff bne _0221A892 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, r6, r7, pc} _0221A892: add r0, r5, #0 @@ -18586,7 +18586,7 @@ _0221AA6A: add r1, r2, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _0221AA78: add sp, #4 pop {r3, r4, r5, r6, pc} @@ -18598,7 +18598,7 @@ ov08_0221AA7C: ; 0x0221AA7C add r5, r0, #0 bl ov08_02212014 mov r1, #0x5c - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r0, #0 strb r0, [r4, #8] @@ -18854,7 +18854,7 @@ _0221ACA8: add r1, r2, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _0221ACB6: add sp, #0xc pop {r3, r4, pc} @@ -18867,7 +18867,7 @@ ov08_0221ACBC: ; 0x0221ACBC add r5, r0, #0 bl ov08_02212014 mov r1, #0x68 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r0, #0 strb r0, [r4, #8] @@ -18990,7 +18990,7 @@ ov08_0221ADC0: ; 0x0221ADC0 add r1, r5, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, pc} nop _0221ADEC: .word 0xFFFF1FFF @@ -19132,7 +19132,7 @@ _0221AF0A: add r1, r2, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #8 pop {r4, pc} @@ -19231,7 +19231,7 @@ _0221AFE0: cmp r6, #0xff bne _0221AFEC add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, r6, r7, pc} _0221AFEC: add r0, r5, #0 @@ -19241,7 +19241,7 @@ _0221AFEC: cmp r0, #0 bne _0221B002 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, r6, r7, pc} _0221B002: add r1, r4, #0 @@ -19322,7 +19322,7 @@ ov08_0221B068: ; 0x0221B068 add r1, r5, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _0221B0AC: pop {r3, r4, r5, pc} .align 2, 0 @@ -19415,7 +19415,7 @@ _0221B160: add r1, r2, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_start ov08_0221B170 @@ -19774,7 +19774,7 @@ ov08_0221B434: ; 0x0221B434 add r1, r5, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _0221B458: pop {r3, r4, r5, pc} .align 2, 0 @@ -19937,7 +19937,7 @@ _0221B59C: add r1, r5, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _0221B5B0: pop {r3, r4, r5, pc} .align 2, 0 @@ -20209,7 +20209,7 @@ _0221B7B4: add r1, r5, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _0221B7E6: pop {r3, r4, r5, pc} @@ -20277,7 +20277,7 @@ _0221B83E: add r1, r5, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _0221B870: pop {r3, r4, r5, pc} .align 2, 0 @@ -20338,7 +20338,7 @@ _0221B8C8: add r1, r5, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _0221B8E6: pop {r3, r4, r5, pc} @@ -20562,7 +20562,7 @@ _0221BAAC: add r1, r2, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _0221BABA: add sp, #4 pop {r3, r4, pc} @@ -20641,7 +20641,7 @@ _0221BB50: add r1, r2, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} _0221BB60: mov r1, #0x20 @@ -21507,7 +21507,7 @@ ov08_0221C24C: ; 0x0221C24C add r1, r6, #0 bl ov08_02212438 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free pop {r4, r5, r6, pc} _0221C282: add r0, r5, #0 @@ -21717,7 +21717,7 @@ ov08_0221C428: ; 0x0221C428 add r1, r5, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, pc} _0221C44E: bl sub_0200C5A8 @@ -21888,7 +21888,7 @@ _0221C59E: add r1, r4, #0 bl ov08_02212438 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free pop {r4, r5, r6, pc} _0221C5B4: ldr r0, [r5, #0x1c] @@ -21978,7 +21978,7 @@ ov08_0221C660: ; 0x0221C660 add r1, r5, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, pc} _0221C686: bl sub_0200C5A8 @@ -22184,7 +22184,7 @@ _0221C816: add r1, r5, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x10 pop {r3, r4, r5, pc} _0221C82E: @@ -22591,7 +22591,7 @@ _0221CB0E: add r1, r5, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, pc} _0221CB66: ldr r0, [r4, #0x1c] @@ -22676,7 +22676,7 @@ _0221CC18: mov r1, #0 bl sub_0200C644 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, r6, r7, pc} _0221CC28: add r0, r5, #0 @@ -22879,7 +22879,7 @@ ov08_0221CD94: ; 0x0221CD94 add r1, r2, #0 bl ov08_02212438 add r0, r6, #0 - bl FreeToHeap + bl Heap_Free pop {r4, r5, r6, pc} _0221CDB0: sub r0, r0, #1 @@ -23014,7 +23014,7 @@ _0221CEB2: add r1, r4, #0 bl ov08_02212438 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free _0221CEC0: add sp, #0x14 pop {r3, r4, r5, r6, pc} @@ -23264,7 +23264,7 @@ _0221D09E: ldr r1, [sp, #0xc] bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x1c pop {r4, r5, r6, r7, pc} _0221D0B0: @@ -23306,7 +23306,7 @@ ov08_0221D0EC: ; 0x0221D0EC add r7, r3, #0 bl ov08_02212014 mov r1, #0x44 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _0221D10A bl GF_AssertFail @@ -23672,7 +23672,7 @@ _0221D404: add r1, r2, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _0221D412: add sp, #4 pop {r3, r4, r5, r6, pc} @@ -23685,7 +23685,7 @@ ov08_0221D418: ; 0x0221D418 add r5, r0, #0 bl ov08_02212014 mov r1, #0x5c - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r0, #0 strb r0, [r4, #8] @@ -24001,7 +24001,7 @@ _0221D6CC: add r1, r2, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0xc pop {r3, r4, pc} .align 2, 0 @@ -24013,7 +24013,7 @@ ov08_0221D6E0: ; 0x0221D6E0 add r5, r0, #0 bl ov08_02212014 mov r1, #0x58 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r0, #0 strb r0, [r4] @@ -24267,7 +24267,7 @@ _0221D8E2: add r1, r2, #0 bl ov08_02212438 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} _0221D8F4: @@ -24288,7 +24288,7 @@ ov08_0221D910: ; 0x0221D910 str r0, [sp, #0x18] bl ov08_02212014 mov r1, #0xb8 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r0, #0 strb r0, [r4, #1] @@ -24642,7 +24642,7 @@ _0221DC44: add r1, r2, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, pc} .align 2, 0 _0221DC54: .word ov08_0222C531 @@ -24764,7 +24764,7 @@ _0221DD42: add r1, r2, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0xc pop {r4, r5, pc} .align 2, 0 @@ -25014,7 +25014,7 @@ _0221DF24: add r1, r5, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0xc pop {r4, r5, pc} .align 2, 0 @@ -25181,7 +25181,7 @@ _0221E0B6: add r1, r2, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _0221E0C4: add sp, #0xc pop {r3, r4, pc} @@ -25341,7 +25341,7 @@ _0221E1F8: add r1, r2, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0xc pop {r3, r4, r5, r6, pc} nop @@ -25471,7 +25471,7 @@ _0221E308: add r1, r2, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} _0221E324: ldr r0, [r4, #0xc] @@ -25842,7 +25842,7 @@ _0221E61A: add r1, r5, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x2c pop {r4, r5, r6, r7, pc} _0221E636: @@ -26118,7 +26118,7 @@ _0221E866: add r1, r2, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _0221E874: add sp, #0xc pop {r4, r5, r6, r7, pc} @@ -26225,7 +26225,7 @@ _0221E946: add r1, r2, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 @@ -26428,7 +26428,7 @@ _0221EAE6: add r1, r5, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, pc} .align 2, 0 _0221EB00: .word ov08_0222C5B0 @@ -26489,7 +26489,7 @@ _0221EB6A: add r1, r2, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _0221EB78: add sp, #8 pop {r4, pc} @@ -26635,7 +26635,7 @@ _0221ECA0: add r1, r2, #0 bl ov08_02212438 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, r6, r7, pc} thumb_func_start ov08_0221ECB0 @@ -26817,7 +26817,7 @@ _0221EE00: add r1, r2, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #4 pop {r3, r4, pc} .align 2, 0 @@ -27925,7 +27925,7 @@ _0221F738: ldr r1, [sp, #0x10] bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x3c pop {r4, r5, r6, r7, pc} _0221F74A: @@ -28277,7 +28277,7 @@ _0221FA08: add r1, r7, #0 bl ov08_02212438 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, r6, r7, pc} _0221FA18: ldrb r0, [r5, #5] @@ -28312,7 +28312,7 @@ ov08_0221FA44: ; 0x0221FA44 str r3, [sp] bl ov08_02212014 mov r1, #0x44 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _0221FA62 bl GF_AssertFail @@ -28720,7 +28720,7 @@ _0221FD8A: add r1, r7, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0xc pop {r4, r5, r6, r7, pc} _0221FD9C: @@ -28766,7 +28766,7 @@ ov08_0221FDE4: ; 0x0221FDE4 add r7, r3, #0 bl ov08_02212014 mov r1, #0x84 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _0221FE02 bl GF_AssertFail @@ -29212,7 +29212,7 @@ _02220164: add r1, r2, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, r5, r6, pc} _02220174: ldr r0, [r4, #0x10] @@ -29231,7 +29231,7 @@ ov08_02220180: ; 0x02220180 add r7, r3, #0 bl ov08_02212014 ldr r1, _022202E8 ; =0x00000564 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _0222019E bl GF_AssertFail @@ -29516,7 +29516,7 @@ _022203EA: add r1, r5, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x14 pop {r3, r4, r5, r6, pc} _02220410: @@ -29681,7 +29681,7 @@ _0222054E: ldr r0, [r0, #4] bl ov08_02212438 ldr r0, [sp, #4] - bl FreeToHeap + bl Heap_Free add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02220570: @@ -30061,7 +30061,7 @@ _0222086A: ldr r1, [sp, #0x1c] bl ov08_02212438 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x24 pop {r4, r5, r6, r7, pc} _0222088A: @@ -30808,7 +30808,7 @@ _02220EE6: ldr r0, [r0, #4] bl ov08_02212438 ldr r0, [sp, #4] - bl FreeToHeap + bl Heap_Free add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02220F08: @@ -31160,7 +31160,7 @@ _022211D6: add r1, r4, #0 bl ov08_02212438 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x1c pop {r4, r5, pc} _022211FE: @@ -31554,7 +31554,7 @@ _02221560: add r1, r5, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x58 pop {r3, r4, r5, pc} @@ -31926,7 +31926,7 @@ _0222181E: mov r1, #0x17 bl sub_02007558 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #4 pop {r3, r4, r5, r6, pc} .align 2, 0 @@ -32108,7 +32108,7 @@ _022219B8: add r1, r5, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _022219EE: add sp, #0xc pop {r4, r5, pc} @@ -32121,7 +32121,7 @@ ov08_022219F4: ; 0x022219F4 add r5, r0, #0 bl ov08_02212014 mov r1, #0xf0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 str r5, [r4] add r0, r5, #0 @@ -32408,7 +32408,7 @@ _02221C32: add r1, r5, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02221C62: add sp, #8 pop {r3, r4, r5, pc} @@ -32421,7 +32421,7 @@ ov08_02221C68: ; 0x02221C68 add r5, r0, #0 bl ov08_02212014 mov r1, #0xf0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 str r5, [r4] mov r0, #0 @@ -32942,7 +32942,7 @@ _0222207C: add r1, r7, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, r6, r7, pc} _022220A0: ldr r0, [r4, #8] @@ -32964,7 +32964,7 @@ ov08_022220B4: ; 0x022220B4 bl ov08_02212014 mov r1, #1 lsl r1, r1, #8 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 str r5, [r4] str r6, [r4, #4] @@ -33245,7 +33245,7 @@ _0222232A: add r1, r2, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0xc pop {r4, r5, pc} _0222233C: @@ -33262,7 +33262,7 @@ ov08_02222348: ; 0x02222348 add r5, r0, #0 bl ov08_02212014 mov r1, #0x68 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 str r5, [r4] add r0, r5, #0 @@ -33614,7 +33614,7 @@ _022225CE: add r1, r6, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02222650: add sp, #8 pop {r4, r5, r6, pc} @@ -33626,7 +33626,7 @@ ov08_02222654: ; 0x02222654 add r5, r0, #0 bl ov08_02212014 mov r1, #0x68 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x68 add r4, r0, #0 @@ -33866,7 +33866,7 @@ _02222862: add r1, r2, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #8 pop {r3, r4, r5, pc} _02222874: @@ -34027,7 +34027,7 @@ _022229B4: add r1, r2, #0 bl ov08_02212438 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free _022229C2: add sp, #0xc pop {r4, r5, pc} @@ -34039,7 +34039,7 @@ ov08_022229C8: ; 0x022229C8 add r5, r0, #0 bl ov08_02212014 mov r1, #0x50 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x50 @@ -34115,7 +34115,7 @@ ov08_02222A78: ; 0x02222A78 add r5, r0, #0 bl ov08_02212014 mov r1, #0x40 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x40 @@ -34378,7 +34378,7 @@ _02222C3E: add r1, r6, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02222CC4: pop {r4, r5, r6, pc} .align 2, 0 @@ -34650,7 +34650,7 @@ _02222F06: add r1, r5, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0xc pop {r4, r5, pc} _02222F1E: @@ -35039,7 +35039,7 @@ _02223226: add r1, r7, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, r6, r7, pc} _02223244: ldr r0, [r4, #8] @@ -35354,7 +35354,7 @@ _022234BA: add r1, r5, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x10 pop {r3, r4, r5, pc} _022234D2: @@ -35550,7 +35550,7 @@ _02223664: add r1, r2, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #8 pop {r4, pc} _02223676: @@ -35805,7 +35805,7 @@ _0222386E: add r1, r5, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, pc} _02223884: ldr r0, [r4, #8] @@ -36171,7 +36171,7 @@ _02223B64: add r1, r5, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #8 pop {r3, r4, r5, pc} _02223B7C: @@ -36525,7 +36525,7 @@ _02223E30: add r1, r5, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0xc pop {r4, r5, r6, r7, pc} _02223E48: @@ -36829,7 +36829,7 @@ _022240A8: add r1, r2, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _022240B6: pop {r4, pc} @@ -37041,7 +37041,7 @@ _02224250: add r1, r2, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _0222425E: pop {r4, pc} @@ -37448,7 +37448,7 @@ _02224590: add r1, r5, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #8 pop {r3, r4, r5, pc} _022245A8: @@ -37604,7 +37604,7 @@ _022246C8: add r1, r2, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_start ov08_022246D8 @@ -37858,7 +37858,7 @@ _022248D4: add r1, r2, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _022248E2: add sp, #8 pop {r4, pc} @@ -38267,7 +38267,7 @@ _02224BF6: add r1, r7, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, r6, r7, pc} _02224C14: ldr r0, [r4, #8] @@ -38602,7 +38602,7 @@ _02224EC2: add r1, r5, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #8 pop {r3, r4, r5, pc} _02224EDA: @@ -39195,7 +39195,7 @@ _0222539C: add r1, r2, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _022253AA: ldr r0, [r4, #4] bl sub_0200BC1C @@ -39525,7 +39525,7 @@ _0222566A: cmp r6, #3 blt _0222566A add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4] add r1, r7, #0 bl ov08_02212438 @@ -39873,7 +39873,7 @@ _02225946: cmp r6, #6 blt _02225946 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4] add r1, r7, #0 bl ov08_02212438 @@ -40192,7 +40192,7 @@ _02225BD8: cmp r4, #0xf blt _02225BD8 add r0, r6, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r6] add r1, r7, #0 bl ov08_02212438 @@ -40560,7 +40560,7 @@ _02225E68: lsr r1, r1, #0x18 bl BgClearTilemapBufferAndCommit add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4] add r1, r6, #0 bl ov08_02212438 @@ -40827,7 +40827,7 @@ _0222610E: pop {r4, r5, pc} _02226126: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4] add r1, r5, #0 bl ov08_02212438 @@ -40938,7 +40938,7 @@ _022261F8: add r1, r5, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #8 pop {r3, r4, r5, pc} _02226210: @@ -41194,7 +41194,7 @@ _022263E6: add r2, #0xf3 bl sub_02007558 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4] add r1, r5, #0 bl ov08_02212438 @@ -41270,7 +41270,7 @@ ov08_022264A4: ; 0x022264A4 ldr r0, [r4, #0x2c] bl sub_0200C3DC add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4] add r1, r5, #0 bl ov08_02212438 @@ -41525,7 +41525,7 @@ _022266BA: mov r1, #1 bl sub_02007558 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4] add r1, r5, #0 bl ov08_02212438 @@ -41708,7 +41708,7 @@ _02226836: mov r1, #1 bl sub_02007558 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4] add r1, r5, #0 bl ov08_02212438 @@ -41944,7 +41944,7 @@ _02226A2A: add r1, r7, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, r6, r7, pc} _02226A48: ldr r0, [r4, #0xc] @@ -42162,7 +42162,7 @@ _02226C00: add r1, r5, #0 bl ov08_02212438 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #8 pop {r3, r4, r5, pc} _02226C18: @@ -42390,7 +42390,7 @@ _02226DC0: ldr r0, [r0] bl ov08_02212438 ldr r0, [sp] - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, r6, r7, pc} _02226DE0: ldr r0, [sp] @@ -42607,7 +42607,7 @@ _02226F82: cmp r6, #6 blt _02226F82 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4] add r1, r7, #0 bl ov08_02212438 @@ -44760,7 +44760,7 @@ _02228072: add r0, r4, #0 bl ov08_02212014 add r1, r5, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _02228086 bl GF_AssertFail @@ -44780,7 +44780,7 @@ ov08_02228094: ; 0x02228094 bl GF_AssertFail _0222809E: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 @@ -44986,7 +44986,7 @@ ov08_022281F4: ; 0x022281F4 push {r4, lr} mov r1, #0xb8 add r4, r0, #0 - bl AllocFromHeap + bl Heap_Alloc cmp r0, #0 bne _0222820A bl GF_AssertFail @@ -45529,10 +45529,10 @@ _02228616: thumb_func_start ov08_02228618 ov08_02228618: ; 0x02228618 - ldr r3, _0222861C ; =FreeToHeap + ldr r3, _0222861C ; =Heap_Free bx r3 .align 2, 0 -_0222861C: .word FreeToHeap +_0222861C: .word Heap_Free thumb_func_start ov08_02228620 ov08_02228620: ; 0x02228620 @@ -45556,7 +45556,7 @@ ov08_02228620: ; 0x02228620 add r0, r5, #0 bl SysTask_Destroy add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, pc} _02228654: sub r0, r0, #1 @@ -45609,7 +45609,7 @@ _0222869A: _022286AC: ldr r0, [r6] mov r1, #0x1c - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _022286BC bl GF_AssertFail @@ -45853,7 +45853,7 @@ ov08_02228880: ; 0x02228880 add r5, r0, #0 ldr r0, [r5, #8] mov r1, #0x24 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _02228894 bl GF_AssertFail @@ -45972,10 +45972,10 @@ _0222896C: thumb_func_start ov08_02228970 ov08_02228970: ; 0x02228970 - ldr r3, _02228974 ; =FreeToHeap + ldr r3, _02228974 ; =Heap_Free bx r3 .align 2, 0 -_02228974: .word FreeToHeap +_02228974: .word Heap_Free thumb_func_start ov08_02228978 ov08_02228978: ; 0x02228978 @@ -48086,7 +48086,7 @@ ov08_02229918: ; 0x02229918 add r5, r0, #0 ldr r0, [r5, #4] mov r1, #0xe0 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0xe0 add r4, r0, #0 @@ -48247,7 +48247,7 @@ _02229A36: ldr r0, [r0] bl SysTask_Destroy add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 @@ -49115,7 +49115,7 @@ ov08_0222A0D4: ; 0x0222A0D4 add r5, r1, #0 mov r1, #0x48 add r6, r0, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _0222A0EC bl GF_AssertFail @@ -49187,14 +49187,14 @@ _0222A154: ldr r0, [r5, #8] cmp r0, #0 beq _0222A15E - bl FreeToHeap + bl Heap_Free _0222A15E: add r4, r4, #1 add r5, r5, #4 cmp r4, #0x10 blt _0222A154 add r0, r6, #0 - bl FreeToHeap + bl Heap_Free pop {r4, r5, r6, pc} .align 2, 0 @@ -49231,7 +49231,7 @@ ov08_0222A1A0: ; 0x0222A1A0 add r6, r1, #0 mov r1, #0x24 add r5, r0, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _0222A1B8 bl GF_AssertFail diff --git a/arm9/overlays/09/asm/overlay_09.s b/arm9/overlays/09/asm/overlay_09.s index 08b45a96c..416ff2bdb 100644 --- a/arm9/overlays/09/asm/overlay_09.s +++ b/arm9/overlays/09/asm/overlay_09.s @@ -2191,7 +2191,7 @@ ov09_02212F8C: ; 0x02212F8C add r1, #0xc bl ov09_0221790C add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r2, [r5] mov r0, #0x48 ldr r2, [r2, #0xc] @@ -2205,7 +2205,7 @@ ov09_02212F8C: ; 0x02212F8C add r1, #0xc bl ov09_02217C38 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #1 str r0, [sp] lsl r0, r0, #9 @@ -2305,7 +2305,7 @@ ov09_02212F8C: ; 0x02212F8C ldr r0, [r5] mov r1, #0x20 ldr r0, [r0, #0xc] - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x1a lsl r1, r1, #4 add r1, r6, r1 @@ -2345,7 +2345,7 @@ ov09_02212F8C: ; 0x02212F8C mov r2, #1 bl PaletteData_LoadPalette add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x14 pop {r3, r4, r5, r6, pc} nop @@ -3434,7 +3434,7 @@ _02213976: lsr r1, r1, #0x18 bl ScheduleBgTilemapBufferTransfer add r0, r7, #0 - bl FreeToHeap + bl Heap_Free add r4, r4, #1 add r6, r6, #4 cmp r4, #2 @@ -8687,7 +8687,7 @@ _0221668E: bl String_Delete _022166BE: add r0, r6, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -11729,7 +11729,7 @@ ov09_02217F88: ; 0x02217F88 mul r1, r7 ldr r0, [r0, #0xc] lsl r1, r1, #1 - bl AllocFromHeap + bl Heap_Alloc str r0, [sp, #0x18] ldr r0, [sp, #0x14] ldr r1, [sp, #0x18] @@ -11757,7 +11757,7 @@ ov09_02217F88: ; 0x02217F88 mov r1, #6 bl ScheduleBgTilemapBufferTransfer ldr r0, [sp, #0x18] - bl FreeToHeap + bl Heap_Free add sp, #0x1c pop {r4, r5, r6, r7, pc} nop @@ -14016,7 +14016,7 @@ ov09_022191C0: ; 0x022191C0 add r1, #0xc bl ov09_0221A2F4 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #1 str r0, [sp] mov r0, #6 @@ -16829,7 +16829,7 @@ ov09_0221A884: ; 0x0221A884 mul r1, r7 ldr r0, [r0, #0xc] lsl r1, r1, #1 - bl AllocFromHeap + bl Heap_Alloc str r0, [sp, #0x18] ldr r0, [sp, #0x14] ldr r1, [sp, #0x18] @@ -16853,7 +16853,7 @@ ov09_0221A884: ; 0x0221A884 mov r1, #6 bl ScheduleBgTilemapBufferTransfer ldr r0, [sp, #0x18] - bl FreeToHeap + bl Heap_Free add sp, #0x1c pop {r4, r5, r6, r7, pc} nop @@ -17262,7 +17262,7 @@ _0221AC00: .word 0x0000114D ov09_0221AC04: ; 0x0221AC04 push {r3, lr} mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc add r3, r0, #0 mov r2, #0x10 mov r1, #0 @@ -17275,10 +17275,10 @@ _0221AC12: thumb_func_start ov09_0221AC1C ov09_0221AC1C: ; 0x0221AC1C - ldr r3, _0221AC20 ; =FreeToHeap + ldr r3, _0221AC20 ; =Heap_Free bx r3 .align 2, 0 -_0221AC20: .word FreeToHeap +_0221AC20: .word Heap_Free thumb_func_start ov09_0221AC24 ov09_0221AC24: ; 0x0221AC24 diff --git a/arm9/overlays/11/asm/ov11_0222D5C0_1.s b/arm9/overlays/11/asm/ov11_0222D5C0_1.s index ea6240c24..adc0e4338 100644 --- a/arm9/overlays/11/asm/ov11_0222D5C0_1.s +++ b/arm9/overlays/11/asm/ov11_0222D5C0_1.s @@ -42,7 +42,7 @@ _0222D600: mov r0, #3 mov r1, #5 lsl r2, r2, #0x10 - bl CreateHeap + bl Heap_Create ldr r1, [r5] mov r0, #4 tst r0, r1 @@ -175,7 +175,7 @@ _0222D704: b _0222D7EA _0222D714: mov r0, #5 - bl DestroyHeap + bl Heap_Destroy mov r0, #0xd str r0, [r4] b _0222D7EA @@ -187,7 +187,7 @@ _0222D720: ldr r0, _0222D7F0 ; =SDK_OVERLAY_OVERLAY_07_ID bl UnloadOverlayByID mov r0, #5 - bl DestroyHeap + bl Heap_Destroy mov r0, #0x3e bl sub_02031588 mov r0, #0xc @@ -210,7 +210,7 @@ _0222D752: mov r0, #3 mov r1, #0x49 lsl r2, r0, #0x10 - bl CreateHeap + bl Heap_Create ldr r0, [r5, #4] ldr r1, [sp, #0x24] bl Party_GetMonByIndex @@ -266,7 +266,7 @@ _0222D7C2: add r0, r5, #0 bl sub_0206C92C mov r0, #0x49 - bl DestroyHeap + bl Heap_Destroy mov r0, #0xd str r0, [r4] b _0222D7EA @@ -756,7 +756,7 @@ _0222DC42: mov r1, #0x32 mov r0, #5 lsl r1, r1, #6 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, r7] add r6, r6, #1 add r5, #0x10 @@ -1155,14 +1155,14 @@ _0222DFEC: ldr r1, [r6, #4] bl CopyParty ldr r0, [r5, #0x68] - bl FreeToHeap + bl Heap_Free add r1, r6, #0 add r1, #0xf8 ldr r0, [r5, #0x48] ldr r1, [r1] bl PlayerProfile_Copy ldr r0, [r5, #0x48] - bl FreeToHeap + bl Heap_Free ldr r0, [sp] add r6, r6, #4 add r0, r0, #1 @@ -1180,14 +1180,14 @@ _0222DFEC: ldr r1, [r7, r1] bl Save_Bag_Copy ldr r0, [r4, #0x58] - bl FreeToHeap + bl Heap_Free mov r1, #0x11 lsl r1, r1, #4 ldr r0, [r4, #0x60] ldr r1, [r7, r1] bl Save_Pokedex_Copy ldr r0, [r4, #0x60] - bl FreeToHeap + bl Heap_Free mov r0, #0x45 ldr r1, [r4, #0x64] lsl r0, r0, #2 @@ -1281,13 +1281,13 @@ _0222DFEC: add r7, #0x8c _0222E10A: ldr r0, [r5, r7] - bl FreeToHeap + bl Heap_Free add r6, r6, #1 add r5, #0x10 cmp r6, #4 blt _0222E10A ldr r0, [r4, #0x18] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x28] mov r1, #0 bl PaletteData_FreeBuffers @@ -1357,15 +1357,15 @@ _0222E1AC: mov r1, #3 bl WindowArray_Delete ldr r0, [r4, #4] - bl FreeToHeap + bl Heap_Free mov r0, #0x87 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free mov r0, #0x22 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free mov r0, #0x6a lsl r0, r0, #2 ldr r0, [r4, r0] @@ -1395,7 +1395,7 @@ _0222E220: ldr r0, [r4, r0] bl sub_0201C350 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, _0222E25C ; =SDK_OVERLAY_OVERLAY_08_ID bl UnloadOverlayByID bl sub_02033590 diff --git a/arm9/overlays/11/asm/ov11_0222D5C0_3.s b/arm9/overlays/11/asm/ov11_0222D5C0_3.s index 38ff0d6ad..5deaf0260 100644 --- a/arm9/overlays/11/asm/ov11_0222D5C0_3.s +++ b/arm9/overlays/11/asm/ov11_0222D5C0_3.s @@ -728,7 +728,7 @@ _0222F898: add r5, r4, #0 _0222F8B0: ldr r0, [r5, #0x10] - bl FreeToHeap + bl Heap_Free add r6, r6, #1 add r5, r5, #4 cmp r6, #4 @@ -818,9 +818,9 @@ ov11_0222F93C: ; 0x0222F93C mov r1, #1 bl FreeBgTilemapBuffer ldr r0, [r4, #4] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_start ov11_0222F988 @@ -867,7 +867,7 @@ _0222F9CA: _0222F9DE: mov r0, #5 mov r1, #0x2c - bl AllocFromHeap + bl Heap_Alloc mov r1, #7 lsl r1, r1, #6 str r0, [r4, r1] @@ -998,7 +998,7 @@ _0222FADA: ldr r0, [r0, #0x14] cmp r0, #0 beq _0222FAE8 - bl FreeToHeap + bl Heap_Free _0222FAE8: add r4, r4, #1 add r5, r5, #4 @@ -1007,7 +1007,7 @@ _0222FAE8: mov r0, #7 lsl r0, r0, #6 ldr r0, [r6, r0] - bl FreeToHeap + bl Heap_Free mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _0222FAFE: @@ -1039,7 +1039,7 @@ _0222FB2A: _0222FB2E: mov r0, #5 mov r1, #0x2c - bl AllocFromHeap + bl Heap_Alloc mov r1, #7 lsl r1, r1, #6 str r0, [r4, r1] @@ -1184,7 +1184,7 @@ _0222FC56: ldr r0, [r0, #0x14] cmp r0, #0 beq _0222FC64 - bl FreeToHeap + bl Heap_Free _0222FC64: add r4, r4, #1 add r5, r5, #4 @@ -1193,7 +1193,7 @@ _0222FC64: mov r0, #7 lsl r0, r0, #6 ldr r0, [r6, r0] - bl FreeToHeap + bl Heap_Free mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _0222FC7A: @@ -1228,7 +1228,7 @@ _0222FCA8: bl HandleLoadOverlay mov r0, #5 mov r1, #0x2c - bl AllocFromHeap + bl Heap_Alloc add r6, r0, #0 mov r0, #0x66 lsl r0, r0, #2 @@ -1449,14 +1449,14 @@ _0222FE72: ldr r0, [r5, #0x14] cmp r0, #0 beq _0222FE7C - bl FreeToHeap + bl Heap_Free _0222FE7C: add r4, r4, #1 add r5, r5, #4 cmp r4, #4 blt _0222FE72 add r0, r6, #0 - bl FreeToHeap + bl Heap_Free mov r0, #1 pop {r4, r5, r6, pc} _0222FE8E: diff --git a/arm9/overlays/11/asm/ov11_0222FF68.s b/arm9/overlays/11/asm/ov11_0222FF68.s index 58a8985da..f5fd4b130 100644 --- a/arm9/overlays/11/asm/ov11_0222FF68.s +++ b/arm9/overlays/11/asm/ov11_0222FF68.s @@ -2264,13 +2264,13 @@ ov11_02230FCC: ; 0x02230FCC add r4, r0, #0 mov r0, #5 lsl r1, r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x87 lsl r1, r1, #2 str r0, [r4, r1] mov r0, #5 sub r1, #0x1c - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x22 lsl r1, r1, #4 str r0, [r4, r1] diff --git a/arm9/overlays/11/asm/ov11_02232264.s b/arm9/overlays/11/asm/ov11_02232264.s index da51549af..1236ec086 100644 --- a/arm9/overlays/11/asm/ov11_02232264.s +++ b/arm9/overlays/11/asm/ov11_02232264.s @@ -3073,7 +3073,7 @@ ov11_02233A78: ; 0x02233A78 bl ov11_0223A424 mov r0, #5 mov r1, #0x58 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x5e lsl r1, r1, #2 str r0, [r4, r1] @@ -3467,7 +3467,7 @@ ov11_02233D7C: ; 0x02233D7C add r6, r0, #0 mov r0, #5 mov r1, #0x58 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x5e lsl r1, r1, #2 str r0, [r4, r1] @@ -5461,7 +5461,7 @@ ov11_02234CFC: ; 0x02234CFC str r2, [sp] mov r0, #5 mov r1, #0x60 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 ldr r0, [sp] add r6, r7, #0 @@ -5575,7 +5575,7 @@ _02234DCC: mul r5, r1 _02234DDE: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 add sp, #0x3c pop {r4, r5, r6, r7, pc} @@ -17405,7 +17405,7 @@ _0223AB22: str r0, [sp, #0x30] mov r0, #5 mov r1, #0x18 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x5f ldr r2, [r4, #4] lsl r1, r1, #2 @@ -17813,7 +17813,7 @@ _0223AEAC: ldr r1, [r4, #4] lsl r0, r0, #2 ldr r0, [r1, r0] - bl FreeToHeap + bl Heap_Free mov r0, #0xf add sp, #0xd4 str r0, [r4, #0x28] @@ -18296,7 +18296,7 @@ _0223B298: lsl r0, r0, #2 str r2, [r1, r0] add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [sp, #0x14] bl SysTask_Destroy _0223B2AE: @@ -19725,7 +19725,7 @@ _0223BEBE: lsl r0, r0, #2 str r2, [r1, r0] add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [sp, #0x10] bl SysTask_Destroy add sp, #0x158 @@ -19806,7 +19806,7 @@ _0223BF5E: lsl r0, r0, #2 str r2, [r1, r0] add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [sp, #0x10] bl SysTask_Destroy add sp, #0x158 @@ -19837,7 +19837,7 @@ _0223BFB2: lsl r0, r0, #2 str r2, [r1, r0] add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [sp, #0x10] bl SysTask_Destroy _0223BFD0: diff --git a/arm9/overlays/11/asm/ov11_0223D1DC.s b/arm9/overlays/11/asm/ov11_0223D1DC.s index e46bea518..6c53028fb 100644 --- a/arm9/overlays/11/asm/ov11_0223D1DC.s +++ b/arm9/overlays/11/asm/ov11_0223D1DC.s @@ -9,7 +9,7 @@ ov11_0223D1DC: ; 0x0223D1DC ldr r1, _0223D22C ; =0x0000314C add r5, r0, #0 mov r0, #5 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 ldr r2, _0223D22C ; =0x0000314C mov r0, #0 @@ -88,9 +88,9 @@ ov11_0223D284: ; 0x0223D284 add r4, r0, #0 ldr r0, _0223D298 ; =0x00002120 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 _0223D298: .word 0x00002120 diff --git a/arm9/overlays/11/asm/ov11_0224CA64.s b/arm9/overlays/11/asm/ov11_0224CA64.s index 2866a49f2..737e95e47 100644 --- a/arm9/overlays/11/asm/ov11_0224CA64.s +++ b/arm9/overlays/11/asm/ov11_0224CA64.s @@ -10,7 +10,7 @@ ov11_0224CA64: ; 0x0224CA64 mov r1, #0x69 mov r0, #5 lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r2, #0x69 mov r0, #0 @@ -135,7 +135,7 @@ _0224CB64: add r0, r4, #0 bl ov11_0225468C add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 diff --git a/arm9/overlays/11/asm/ov11_0224D550.s b/arm9/overlays/11/asm/ov11_0224D550.s index b19331607..a144d27e2 100644 --- a/arm9/overlays/11/asm/ov11_0224D550.s +++ b/arm9/overlays/11/asm/ov11_0224D550.s @@ -9,7 +9,7 @@ ov11_0224D550: ; 0x0224D550 add r4, r0, #0 mov r0, #5 mov r1, #0x18 - bl AllocFromHeap + bl Heap_Alloc add r1, r0, #0 str r4, [r1] mov r2, #0 @@ -34,7 +34,7 @@ ov11_0224D574: ; 0x0224D574 bl ov11_0222FF74 mov r0, #5 mov r1, #0x2c - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r2, #0 ldr r0, _0224D720 ; =0x00000195 @@ -242,7 +242,7 @@ ov11_0224D738: ; 0x0224D738 bl ov11_0222FF74 mov r0, #5 mov r1, #0x9c - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 ldr r0, _0224D874 ; =0x00000195 ldrb r1, [r6, r0] @@ -400,7 +400,7 @@ ov11_0224D87C: ; 0x0224D87C bl ov11_0222FF74 mov r0, #5 mov r1, #0x9c - bl AllocFromHeap + bl Heap_Alloc add r5, r0, #0 add r1, r5, #0 mov r0, #0 @@ -611,7 +611,7 @@ ov11_0224DA2C: ; 0x0224DA2C mov r0, #5 mov r1, #0x74 str r2, [sp] - bl AllocFromHeap + bl Heap_Alloc add r2, r0, #0 str r5, [r2] str r4, [r2, #4] @@ -705,7 +705,7 @@ ov11_0224DAE8: ; 0x0224DAE8 mov r0, #5 mov r1, #0x10 add r6, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 str r7, [r4] ldr r0, [r5, #0x20] @@ -756,7 +756,7 @@ ov11_0224DB4C: ; 0x0224DB4C str r0, [sp, #0x2c] mov r0, #5 mov r1, #0x24 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r2, #0 ldr r0, _0224DCCC ; =0x00000195 @@ -946,7 +946,7 @@ ov11_0224DCE4: ; 0x0224DCE4 mov r0, #5 mov r1, #0x1c add r6, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r0, #0 strb r0, [r4, #0xa] @@ -993,7 +993,7 @@ ov11_0224DD44: ; 0x0224DD44 add r4, r1, #0 mov r0, #5 mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc add r1, r0, #0 mov r0, #0 strb r0, [r1, #0xa] @@ -1034,7 +1034,7 @@ ov11_0224DD8C: ; 0x0224DD8C str r0, [sp, #0x14] mov r0, #5 mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r0, #0 ldr r1, _0224DE38 ; =0x00000195 @@ -1252,7 +1252,7 @@ ov11_0224DF60: ; 0x0224DF60 mov r0, #5 mov r1, #0x3c add r5, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r0, #0 add r1, r4, #0 @@ -1364,7 +1364,7 @@ ov11_0224E034: ; 0x0224E034 mov r0, #5 mov r1, #0x24 add r7, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r3, r0, #0 mov r1, #0x65 mov r4, #0 @@ -1423,7 +1423,7 @@ ov11_0224E0A4: ; 0x0224E0A4 mov r0, #5 mov r1, #0x34 add r5, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r6, r0, #0 mov r0, #0 strb r0, [r6, #0xf] @@ -1493,15 +1493,15 @@ ov11_0224E130: ; 0x0224E130 mov r0, #5 mov r1, #0x34 str r2, [sp, #4] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r0, #5 mov r1, #0x34 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #8] mov r0, #5 mov r1, #0x38 - bl AllocFromHeap + bl Heap_Alloc ldr r1, [r4, #8] str r0, [r1, #4] mov r0, #5 @@ -1578,7 +1578,7 @@ ov11_0224E1DC: ; 0x0224E1DC mov r0, #5 mov r1, #0x34 add r7, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r2, r0, #0 mov r3, #0 strb r3, [r2, #0xa] @@ -1635,7 +1635,7 @@ ov11_0224E248: ; 0x0224E248 mov r0, #5 mov r1, #0x1c add r4, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r1, r0, #0 mov r2, #0 strb r2, [r1, #0xe] @@ -1673,7 +1673,7 @@ ov11_0224E28C: ; 0x0224E28C str r0, [sp] mov r0, #5 mov r1, #8 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 str r6, [r4] ldrb r0, [r5] @@ -1721,7 +1721,7 @@ ov11_0224E2F4: ; 0x0224E2F4 str r0, [sp] mov r0, #5 mov r1, #8 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 add r0, r6, #0 str r5, [r4] @@ -1756,7 +1756,7 @@ ov11_0224E344: ; 0x0224E344 mov r0, #5 mov r1, #0x70 add r5, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 add r0, #0x6a @@ -1835,7 +1835,7 @@ ov11_0224E3E0: ; 0x0224E3E0 add r4, r1, #0 mov r0, #5 mov r1, #0xc - bl AllocFromHeap + bl Heap_Alloc add r1, r0, #0 mov r2, #0 strb r2, [r1, #9] @@ -1989,7 +1989,7 @@ ov11_0224E510: ; 0x0224E510 mov r0, #5 mov r1, #0x74 str r2, [sp] - bl AllocFromHeap + bl Heap_Alloc add r1, r0, #0 ldr r0, _0224E5F0 ; =0x00000195 ldrb r2, [r4, r0] @@ -2131,7 +2131,7 @@ ov11_0224E628: ; 0x0224E628 add r4, r1, #0 mov r0, #5 mov r1, #8 - bl AllocFromHeap + bl Heap_Alloc add r1, r0, #0 mov r2, #0 strb r2, [r1, #6] @@ -2159,7 +2159,7 @@ ov11_0224E65C: ; 0x0224E65C mov r0, #5 mov r1, #0x68 str r2, [sp] - bl AllocFromHeap + bl Heap_Alloc add r1, r0, #0 str r5, [r1] ldr r0, [sp] @@ -2275,7 +2275,7 @@ ov11_0224E734: ; 0x0224E734 str r0, [sp, #4] mov r0, #5 mov r1, #8 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 str r6, [r4] ldrb r0, [r7] @@ -2318,7 +2318,7 @@ ov11_0224E790: ; 0x0224E790 str r0, [sp] mov r0, #5 mov r1, #8 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 str r5, [r4] ldrb r0, [r7] @@ -2358,7 +2358,7 @@ ov11_0224E7E8: ; 0x0224E7E8 str r0, [sp] mov r0, #5 mov r1, #8 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 str r5, [r4] ldrb r0, [r7] @@ -2397,7 +2397,7 @@ ov11_0224E840: ; 0x0224E840 add r7, r0, #0 mov r0, #5 mov r1, #8 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 str r5, [r4] mov r0, #0x22 @@ -2437,7 +2437,7 @@ ov11_0224E894: ; 0x0224E894 str r0, [sp] mov r0, #5 mov r1, #8 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 str r5, [r4] ldrb r0, [r7] @@ -2470,7 +2470,7 @@ ov11_0224E8EC: ; 0x0224E8EC add r4, r1, #0 mov r0, #5 mov r1, #0xc - bl AllocFromHeap + bl Heap_Alloc add r1, r0, #0 add r0, r4, #0 str r5, [r1] @@ -2505,7 +2505,7 @@ ov11_0224E924: ; 0x0224E924 str r0, [sp] mov r0, #5 mov r1, #0xc - bl AllocFromHeap + bl Heap_Alloc add r7, r0, #0 str r6, [r7] ldrb r0, [r4] @@ -2660,7 +2660,7 @@ ov11_0224EA74: ; 0x0224EA74 mov r0, #5 mov r1, #0x10 add r4, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r1, r0, #0 mov r2, #0 strb r2, [r1, #0xa] @@ -2689,7 +2689,7 @@ ov11_0224EAAC: ; 0x0224EAAC mov r0, #5 mov r1, #0x10 add r4, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r1, r0, #0 mov r2, #0 strb r2, [r1, #0xa] @@ -2721,7 +2721,7 @@ ov11_0224EAEC: ; 0x0224EAEC mov r0, #5 mov r1, #0x10 add r4, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r1, r0, #0 mov r0, #0 strb r0, [r1, #7] @@ -2759,7 +2759,7 @@ ov11_0224EB34: ; 0x0224EB34 mov r0, #5 mov r1, #0x10 add r6, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r1, r0, #0 mov r2, #0 strb r2, [r1, #7] @@ -2788,7 +2788,7 @@ ov11_0224EB6C: ; 0x0224EB6C mov r0, #5 mov r1, #0x10 add r4, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r1, r0, #0 mov r0, #0 strb r0, [r1, #7] @@ -2827,7 +2827,7 @@ ov11_0224EBB8: ; 0x0224EBB8 mov r0, #5 mov r1, #0x10 add r6, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r1, r0, #0 mov r2, #0 strb r2, [r1, #7] @@ -2923,7 +2923,7 @@ ov11_0224EC80: ; 0x0224EC80 add r4, r1, #0 mov r0, #5 mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc add r1, r0, #0 mov r2, #0 strb r2, [r1, #0xe] @@ -2952,7 +2952,7 @@ ov11_0224ECB8: ; 0x0224ECB8 add r4, r1, #0 mov r0, #5 mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc add r1, r0, #0 mov r2, #0 strb r2, [r1, #0xe] @@ -2987,7 +2987,7 @@ ov11_0224ECF0: ; 0x0224ECF0 add r7, r0, #0 mov r0, #5 mov r1, #8 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 str r5, [r4] mov r0, #0x3b @@ -3026,7 +3026,7 @@ ov11_0224ED44: ; 0x0224ED44 add r7, r0, #0 mov r0, #5 mov r1, #8 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 str r5, [r4] mov r0, #0x3c @@ -3065,7 +3065,7 @@ ov11_0224ED98: ; 0x0224ED98 add r7, r0, #0 mov r0, #5 mov r1, #8 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 str r5, [r4] mov r0, #0x3d @@ -3695,7 +3695,7 @@ _0224F2C2: ldr r0, [r4] bl ov11_022567B8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r6, #0 bl SysTask_Destroy _0224F2D8: @@ -4286,7 +4286,7 @@ _0224F7A2: ldr r0, [r4] bl ov11_022567B8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _0224F7C0: @@ -4982,7 +4982,7 @@ _0224FD68: ldr r0, [r4] bl ov11_022567B8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r6, #0 bl SysTask_Destroy _0224FD86: @@ -5275,7 +5275,7 @@ _0224FFC0: ldr r0, [r4] bl ov11_022567B8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r6, #0 bl SysTask_Destroy _0224FFDE: @@ -5335,7 +5335,7 @@ _02250048: ldr r0, [r4] bl ov11_022567B8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _0225005E: @@ -5659,7 +5659,7 @@ _022502CA: ldr r0, [r4] bl ov11_022567B8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r6, #0 bl SysTask_Destroy add sp, #4 @@ -6338,7 +6338,7 @@ _02250874: ldr r0, [r4] bl ov11_022567B8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _0225088A: @@ -6412,7 +6412,7 @@ _02250906: ldr r0, [r4] bl ov11_022567B8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _0225092A: @@ -6477,7 +6477,7 @@ _0225099A: ldr r0, [r4] bl ov11_022567B8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _022509B0: @@ -7160,7 +7160,7 @@ _02250F14: ldr r0, [r4] bl ov11_022567B8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [sp] bl SysTask_Destroy _02250F3E: @@ -7185,7 +7185,7 @@ ov11_02250F44: ; 0x02250F44 ldr r0, [r4] bl ov11_022567B8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy pop {r3, r4, r5, pc} @@ -7200,7 +7200,7 @@ ov11_02250F74: ; 0x02250F74 ldr r0, [r4] bl ov11_022567B8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy pop {r3, r4, r5, pc} @@ -7253,7 +7253,7 @@ _02250FF2: ldr r0, [r4] bl ov11_022567B8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r6, #0 bl SysTask_Destroy pop {r4, r5, r6, pc} @@ -7275,7 +7275,7 @@ ov11_02251014: ; 0x02251014 ldr r0, [r4] bl ov11_022567B8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy pop {r3, r4, r5, pc} @@ -7457,7 +7457,7 @@ _0225118E: ldr r0, [r4] bl ov11_022567B8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r6, #0 bl SysTask_Destroy _022511B6: @@ -7556,7 +7556,7 @@ _0225126C: ldr r0, [r6] bl ov11_022567B8 add r0, r6, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [sp, #8] bl SysTask_Destroy _0225128C: @@ -7575,7 +7575,7 @@ ov11_02251294: ; 0x02251294 ldr r0, [r4] bl ov11_022567B8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy pop {r3, r4, r5, pc} @@ -7750,7 +7750,7 @@ _022513F8: ldr r0, [r4] bl ov11_022567B8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [sp] bl SysTask_Destroy _02251418: @@ -7785,7 +7785,7 @@ _02251442: ldr r0, [r5] bl ov11_022567B8 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r6, #0 bl SysTask_Destroy pop {r4, r5, r6, pc} @@ -7800,7 +7800,7 @@ ov11_02251464: ; 0x02251464 ldr r0, [r4] bl ov11_022567B8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy pop {r3, r4, r5, pc} @@ -7905,7 +7905,7 @@ _02251540: bl ov11_0222D7F8 mov r0, #5 mov r1, #0x34 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #4] ldr r1, [r4] str r1, [r0] @@ -8530,16 +8530,16 @@ _02251A08: ldr r0, [r4, #8] ldr r0, [r0, #4] ldr r0, [r0] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #8] ldr r0, [r0, #4] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #8] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #4] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r7, #0 bl SysTask_Destroy add sp, #0x1fc @@ -9278,14 +9278,14 @@ ov11_02252018: ; 0x02252018 ldr r0, [r4, #8] ldr r0, [r0, #4] ldr r0, [r0] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #8] ldr r0, [r0, #4] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #8] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy add sp, #4 @@ -9304,14 +9304,14 @@ ov11_02252070: ; 0x02252070 ldr r0, [r4, #8] ldr r0, [r0, #4] ldr r0, [r0] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #8] ldr r0, [r0, #4] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #8] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy pop {r3, r4, r5, pc} @@ -9396,7 +9396,7 @@ _02252146: bl ov11_0222D7F8 mov r0, #5 mov r1, #0x38 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #4] mov r0, #5 bl SaveArray_Party_Alloc @@ -9447,7 +9447,7 @@ _022521AE: cmp r5, #6 blt _022521AE add r0, r6, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4] ldr r1, [sp, #0x18] mov r7, #0 @@ -9760,11 +9760,11 @@ _02252444: bl ov11_022567B8 ldr r0, [r4, #4] ldr r0, [r0] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #4] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r6, #0 bl SysTask_Destroy _02252468: @@ -9852,7 +9852,7 @@ _022524FE: ldr r0, [r5] bl ov11_022567B8 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [sp] bl SysTask_Destroy add sp, #0xc @@ -9869,7 +9869,7 @@ ov11_02252524: ; 0x02252524 ldr r0, [r4] bl ov11_022567B8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy pop {r3, r4, r5, pc} @@ -10092,7 +10092,7 @@ _022526E0: ldr r0, [r4] bl ov11_022567B8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r7, #0 bl SysTask_Destroy _0225270A: @@ -10111,7 +10111,7 @@ ov11_02252714: ; 0x02252714 ldr r0, [r4] bl ov11_022567B8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy pop {r3, r4, r5, pc} @@ -10127,7 +10127,7 @@ ov11_02252734: ; 0x02252734 ldr r0, [r4] bl ov11_022567B8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy pop {r3, r4, r5, pc} @@ -10406,7 +10406,7 @@ _02252974: ldr r0, [r4] bl ov11_022567B8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy add sp, #0x1fc @@ -10473,7 +10473,7 @@ _022529FA: mov r2, #0x17 bl ov11_022567B8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy pop {r3, r4, r5, pc} @@ -10931,7 +10931,7 @@ _02252D8C: ldr r0, [r4] bl ov11_022567B8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r6, #0 bl SysTask_Destroy _02252DAA: @@ -11004,7 +11004,7 @@ _02252E30: ldr r0, [r5] bl ov11_022567B8 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r6, #0 bl SysTask_Destroy _02252E46: @@ -11187,7 +11187,7 @@ _02252F98: ldr r0, [r4] bl ov11_022567B8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r6, #0 bl SysTask_Destroy _02252FB6: @@ -11225,7 +11225,7 @@ _02252FE4: ldr r0, [r4] bl ov11_022567B8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _02253000: @@ -11258,7 +11258,7 @@ _0225302A: ldr r0, [r4] bl ov11_022567B8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _0225304A: @@ -11301,7 +11301,7 @@ _02253074: ldr r0, [r4] bl ov11_022567B8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _0225309E: @@ -11570,7 +11570,7 @@ _022532C8: mov r1, #0 bl sub_020143A8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [sp, #0xc] bl SysTask_Destroy add sp, #0x18 @@ -11739,7 +11739,7 @@ _02253440: bl ov11_0222D7F8 mov r0, #5 mov r1, #0x38 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #4] ldrb r1, [r4, #9] ldr r0, [r4] @@ -11831,9 +11831,9 @@ _02253508: ldr r0, [r4] bl ov11_022567B8 ldr r0, [r4, #4] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _02253524: @@ -11895,7 +11895,7 @@ _02253582: ldr r0, [r5] bl ov11_022567B8 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl SysTask_Destroy _02253598: @@ -11989,7 +11989,7 @@ _02253636: ldr r0, [r5] bl ov11_022567B8 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r6, #0 bl SysTask_Destroy _0225364C: @@ -12057,7 +12057,7 @@ _022536BA: ldr r0, [r5] bl ov11_022567B8 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r7, #0 bl SysTask_Destroy _022536D0: @@ -12096,7 +12096,7 @@ _02253706: ldr r0, [r4] bl ov11_022567B8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy pop {r3, r4, r5, pc} @@ -12141,7 +12141,7 @@ _0225374E: ldr r0, [r4] bl ov11_022567B8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy pop {r3, r4, r5, pc} diff --git a/arm9/overlays/11/asm/ov11_02256C08.s b/arm9/overlays/11/asm/ov11_02256C08.s index 1b3bd358f..6435c3cef 100644 --- a/arm9/overlays/11/asm/ov11_02256C08.s +++ b/arm9/overlays/11/asm/ov11_02256C08.s @@ -1345,7 +1345,7 @@ _02257670: add r4, r0, #0 mov r0, #5 mov r1, #0x80 - bl AllocFromHeap + bl Heap_Alloc add r7, r0, #0 ldr r0, [sp] ldr r0, [r0, #4] @@ -1442,7 +1442,7 @@ _022576DA: ldrh r2, [r3, r2] bl MIi_CpuCopy16 add r0, r7, #0 - bl FreeToHeap + bl Heap_Free add sp, #8 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -1458,11 +1458,11 @@ ov11_0225775C: ; 0x0225775C str r0, [sp, #4] mov r0, #5 mov r1, #0x60 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r0, #5 mov r1, #0xc0 - bl AllocFromHeap + bl Heap_Alloc add r7, r0, #0 add r0, r4, #0 mov r1, #0xff @@ -1573,9 +1573,9 @@ _022577F2: ldrh r2, [r3, r2] bl MIi_CpuCopy16 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r7, #0 - bl FreeToHeap + bl Heap_Free add sp, #0xc pop {r4, r5, r6, r7, pc} nop @@ -1591,7 +1591,7 @@ ov11_0225787C: ; 0x0225787C add r6, r1, #0 mov r0, #5 mov r1, #0x60 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0xff mov r2, #0x60 add r4, r0, #0 @@ -1637,7 +1637,7 @@ ov11_0225787C: ; 0x0225787C add r0, r4, r0 bl MIi_CpuCopy16 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, r6, r7, pc} nop _022578F8: .word ov11_0225EA58 @@ -1651,7 +1651,7 @@ ov11_02257908: ; 0x02257908 add r5, r0, #0 mov r0, #5 mov r1, #0x60 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0xff mov r2, #0x60 add r4, r0, #0 @@ -1682,7 +1682,7 @@ ov11_02257908: ; 0x02257908 ldrh r2, [r3, r2] bl MIi_CpuCopy16 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, pc} .align 2, 0 _02257960: .word ov11_0225E9F8 @@ -2622,7 +2622,7 @@ ov11_0225805C: ; 0x0225805C strb r0, [r6] mov r0, #5 mov r1, #0xc - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0xc add r4, r0, #0 @@ -2745,7 +2745,7 @@ _0225814A: mov r1, #1 strb r1, [r0] add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r7, #0 bl SysTask_Destroy add sp, #8 diff --git a/arm9/overlays/11/asm/ov11_02258428.s b/arm9/overlays/11/asm/ov11_02258428.s index 5cbe59add..5430fb72b 100644 --- a/arm9/overlays/11/asm/ov11_02258428.s +++ b/arm9/overlays/11/asm/ov11_02258428.s @@ -9,7 +9,7 @@ ov11_02258428: ; 0x02258428 mov r1, #7 mov r0, #5 lsl r1, r1, #8 - bl AllocFromHeap + bl Heap_Alloc mov r2, #7 mov r1, #0 lsl r2, r2, #8 @@ -122,7 +122,7 @@ ov11_022584D4: ; 0x022584D4 _02258512: mov r0, #5 add r1, r7, #0 - bl AllocFromHeap + bl Heap_Alloc lsl r1, r4, #2 add r1, r6, r1 str r0, [r1, #0x3c] @@ -144,7 +144,7 @@ _02258512: add r0, #0xc bl MIi_CpuCopy32 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r4, r4, #1 _0225854E: cmp r4, #7 @@ -152,7 +152,7 @@ _0225854E: mov r1, #2 mov r0, #5 lsl r1, r1, #8 - bl AllocFromHeap + bl Heap_Alloc str r0, [r6, #0x58] mov r0, #1 str r0, [sp] @@ -205,7 +205,7 @@ _022585BC: bl sub_020799E8 add r1, r0, #0 mov r0, #5 - bl AllocFromHeap + bl Heap_Alloc lsl r1, r5, #2 add r1, r4, r1 add r1, #0x80 @@ -223,11 +223,11 @@ _022585DE: blt _022585AE mov r0, #5 mov r1, #0x20 - bl AllocFromHeap + bl Heap_Alloc str r0, [r6, #0x5c] mov r0, #5 mov r1, #0x20 - bl AllocFromHeap + bl Heap_Alloc str r0, [r6, #0x60] ldr r1, [r6, #0x5c] ldr r0, [r6, #0x58] @@ -245,7 +245,7 @@ _022585DE: mov r2, #0x20 bl MIi_CpuCopy16 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free bl sub_02002BE4 bl sub_02002C04 ldr r0, _02258650 ; =ov11_0225B824 @@ -284,23 +284,23 @@ ov11_02258658: ; 0x02258658 add r5, r6, #0 _02258680: ldr r0, [r5, #0x3c] - bl FreeToHeap + bl Heap_Free add r4, r4, #1 add r5, r5, #4 cmp r4, #7 blt _02258680 ldr r0, [r6, #0x58] - bl FreeToHeap + bl Heap_Free add r0, r6, #0 bl ov11_0225A6B0 ldr r0, [r6, #0x5c] - bl FreeToHeap + bl Heap_Free ldr r0, [r6, #0x60] - bl FreeToHeap + bl Heap_Free ldr r0, [r6, #0x64] bl SysTask_Destroy add r0, r6, #0 - bl FreeToHeap + bl Heap_Free pop {r4, r5, r6, pc} .align 2, 0 _022586B4: .word 0x000004C8 @@ -1692,7 +1692,7 @@ ov11_0225916C: ; 0x0225916C str r0, [r1] mov r0, #5 mov r1, #0x14 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x14 @@ -4224,7 +4224,7 @@ _0225A6E4: ldr r0, [sp, #4] add r0, #0x80 ldr r0, [r0] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 add r0, #0x9c ldr r0, [r0] @@ -4362,7 +4362,7 @@ _0225A7CE: ldr r2, [sp, #0xc] bl MIi_CpuCopy32 ldr r0, [sp, #0x44] - bl FreeToHeap + bl Heap_Free _0225A814: ldr r0, [r6, #0x34] cmp r0, #0 @@ -6034,7 +6034,7 @@ _0225B4D6: ldr r0, [r0] bl ov11_022312AC add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r6, #0 bl SysTask_Destroy _0225B526: diff --git a/arm9/overlays/11/asm/ov11_0225C91C.s b/arm9/overlays/11/asm/ov11_0225C91C.s index 98a89877c..c94e604d9 100644 --- a/arm9/overlays/11/asm/ov11_0225C91C.s +++ b/arm9/overlays/11/asm/ov11_0225C91C.s @@ -91,7 +91,7 @@ ov11_0225C9D4: ; 0x0225C9D4 push {r4, lr} mov r0, #5 lsl r1, r0, #6 - bl AllocFromHeap + bl Heap_Alloc mov r2, #5 mov r1, #0 lsl r2, r2, #6 @@ -111,7 +111,7 @@ ov11_0225C9F0: ; 0x0225C9F0 bl GF_AssertFail _0225C9FE: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 diff --git a/arm9/overlays/11/asm/ov11_0225D3EC.s b/arm9/overlays/11/asm/ov11_0225D3EC.s index d5ae62bb3..e0f7226f5 100644 --- a/arm9/overlays/11/asm/ov11_0225D3EC.s +++ b/arm9/overlays/11/asm/ov11_0225D3EC.s @@ -108,7 +108,7 @@ _0225D496: ldr r0, [sp, #0x60] str r0, [sp, #0x30] mov r0, ip - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x18 str r0, [sp] @@ -156,7 +156,7 @@ _0225D510: ldr r0, [r6, #0x14] bl SysTask_Destroy add r0, r6, #0 - bl FreeToHeap + bl Heap_Free pop {r4, r5, r6, pc} thumb_func_start ov11_0225D52C diff --git a/arm9/overlays/11/asm/ov11_0225D6A4.s b/arm9/overlays/11/asm/ov11_0225D6A4.s index 55ba7950f..708e1ab66 100644 --- a/arm9/overlays/11/asm/ov11_0225D6A4.s +++ b/arm9/overlays/11/asm/ov11_0225D6A4.s @@ -107,7 +107,7 @@ _0225D74C: ldr r0, [sp, #0x60] str r0, [sp, #0x30] add r0, r2, #0 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x20 add r4, r0, #0 @@ -144,7 +144,7 @@ ov11_0225D7B8: ; 0x0225D7B8 ldr r0, [r4, #4] bl SysTask_Destroy add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_start ov11_0225D7D0 diff --git a/arm9/overlays/12/asm/overlay_12.s b/arm9/overlays/12/asm/overlay_12.s index 50a148498..aeabc7bf7 100644 --- a/arm9/overlays/12/asm/overlay_12.s +++ b/arm9/overlays/12/asm/overlay_12.s @@ -40,7 +40,7 @@ ov12_0222D5C0: ; 0x0222D5C0 mov r0, #3 mov r1, #0x15 lsl r2, r2, #0x10 - bl CreateHeap + bl Heap_Create ldr r1, _0222D868 ; =0x00001658 add r0, r5, #0 mov r2, #0x15 @@ -508,7 +508,7 @@ ov12_0222D9B0: ; 0x0222D9B0 ldr r0, [r4, #0x50] bl DestroyMsgData ldr r0, [r4, #0x30] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #4] bl SysTask_Destroy ldr r0, [r4, #8] @@ -521,7 +521,7 @@ ov12_0222D9B0: ; 0x0222D9B0 bl Main_SetVBlankIntrCB bl sub_02015F1C mov r0, #0x15 - bl DestroyHeap + bl Heap_Destroy bl sub_02083404 bl sub_02033ED0 ldr r0, _0222DADC ; =SDK_OVERLAY_OVERLAY_08_ID @@ -1167,11 +1167,11 @@ ov12_0222DFC4: ; 0x0222DFC4 bl PaletteData_LoadNarc mov r0, #0x15 mov r1, #0x20 - bl AllocFromHeap + bl Heap_Alloc add r7, r0, #0 mov r0, #0x15 mov r1, #0x20 - bl AllocFromHeap + bl Heap_Alloc str r0, [sp, #0x10] ldr r0, [r5, #0x5c] mov r1, #0 @@ -1229,9 +1229,9 @@ ov12_0222DFC4: ; 0x0222DFC4 mov r2, #0x20 bl MIi_CpuCopy16 add r0, r7, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [sp, #0x10] - bl FreeToHeap + bl Heap_Free add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -3175,7 +3175,7 @@ ov12_0222EF04: ; 0x0222EF04 mov r0, #3 mov r1, #0x16 lsl r2, r2, #0x10 - bl CreateHeap + bl Heap_Create ldr r1, _0222F168 ; =0x00000F68 add r0, r4, #0 mov r2, #0x16 @@ -3673,7 +3673,7 @@ _0222F3AE: ldr r0, [r4, #0x44] bl DestroyMsgData ldr r0, [r4, #0x30] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #4] bl SysTask_Destroy ldr r0, [r4, #8] @@ -3686,7 +3686,7 @@ _0222F3AE: bl Main_SetVBlankIntrCB bl sub_02015F1C mov r0, #0x16 - bl DestroyHeap + bl Heap_Destroy bl sub_02083404 bl sub_02033ED0 ldr r0, _0222F450 ; =SDK_OVERLAY_OVERLAY_08_ID @@ -5015,7 +5015,7 @@ ov12_0222FE4C: ; 0x0222FE4C mov r0, #3 mov r1, #0x17 lsl r2, r2, #0x10 - bl CreateHeap + bl Heap_Create ldr r1, _022300EC ; =0x00001BF4 add r0, r4, #0 mov r2, #0x17 @@ -5085,7 +5085,7 @@ ov12_0222FE4C: ; 0x0222FE4C mov r1, #2 mov r0, #0x17 lsl r1, r1, #8 - bl AllocFromHeap + bl Heap_Alloc ldr r1, _022300F0 ; =0x0000110C str r0, [r5, r1] add r0, r5, #0 @@ -5479,7 +5479,7 @@ _02230296: bl sub_02002CF8 ldr r0, _022303B4 ; =0x0000110C ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 add r0, #0xa4 ldr r0, [r0] @@ -5517,7 +5517,7 @@ _02230296: ldr r0, [r0] bl DestroyMsgData ldr r0, [r4, #0x74] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #4] bl SysTask_Destroy ldr r0, [r4, #0x10] @@ -5530,7 +5530,7 @@ _02230296: bl Main_SetVBlankIntrCB bl sub_02015F1C mov r0, #0x17 - bl DestroyHeap + bl Heap_Destroy bl sub_02083404 bl sub_02033ED0 ldr r0, _022303B8 ; =SDK_OVERLAY_OVERLAY_08_ID @@ -6297,7 +6297,7 @@ _022309E8: mov r1, #0x12 mov r0, #0x17 lsl r1, r1, #0xa - bl AllocFromHeap + bl Heap_Alloc add r2, r0, #0 mov r0, #1 str r0, [sp] @@ -6341,7 +6341,7 @@ ov12_02230A40: ; 0x02230A40 ldr r0, [r4, #0xc] bl sub_02012DE4 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #0xc] pop {r3, r4, r5, pc} @@ -7730,7 +7730,7 @@ _022314E0: cmp r6, #4 blt _022314E0 add r0, r7, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, r6, r7, pc} nop _02231504: .word 0x00000122 @@ -8214,7 +8214,7 @@ ov12_022318A4: ; 0x022318A4 mov r1, #0x14 add r6, r2, #0 add r7, r3, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x14 @@ -8246,7 +8246,7 @@ _022318EA: ldr r0, [r4] bl SysTask_Destroy add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_start ov12_022318F8 @@ -8325,7 +8325,7 @@ ov12_0223197C: ; 0x0223197C mov r1, #0x32 mov r0, #0x15 lsl r1, r1, #4 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x32 mov r1, #0 lsl r2, r2, #4 @@ -8428,7 +8428,7 @@ ov12_02231A24: ; 0x02231A24 _02231A4C: mov r0, #0x15 add r1, r7, #0 - bl AllocFromHeap + bl Heap_Alloc lsl r1, r5, #2 add r1, r4, r1 str r0, [r1, #0x20] @@ -8450,7 +8450,7 @@ _02231A4C: add r0, #0xc bl MIi_CpuCopy32 add r0, r6, #0 - bl FreeToHeap + bl Heap_Free add r5, r5, #1 _02231A88: cmp r5, #5 @@ -8464,7 +8464,7 @@ _02231A88: _02231A98: mov r0, #0x15 add r1, r7, #0 - bl AllocFromHeap + bl Heap_Alloc lsl r1, r5, #2 add r1, r4, r1 str r0, [r1, #0x34] @@ -8522,7 +8522,7 @@ ov12_02231AE8: ; 0x02231AE8 add r5, r6, #0 _02231B16: ldr r0, [r5, #0x20] - bl FreeToHeap + bl Heap_Free add r4, r4, #1 add r5, r5, #4 cmp r4, #5 @@ -8531,7 +8531,7 @@ _02231B16: add r4, r6, #0 _02231B28: ldr r0, [r4, #0x34] - bl FreeToHeap + bl Heap_Free add r5, r5, #1 add r4, r4, #4 cmp r5, #2 @@ -8539,7 +8539,7 @@ _02231B28: add r0, r6, #0 bl ov12_02232B7C add r0, r6, #0 - bl FreeToHeap + bl Heap_Free add sp, #4 pop {r3, r4, r5, r6, pc} nop @@ -11742,7 +11742,7 @@ ov12_0223336C: ; 0x0223336C mov r0, #0xb6 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free mov r0, #0xb6 mov r1, #0 lsl r0, r0, #2 @@ -12055,7 +12055,7 @@ ov12_022335E4: ; 0x022335E4 add r6, r1, #0 mov r0, #0x15 mov r1, #0xc - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0xc add r4, r0, #0 @@ -12086,7 +12086,7 @@ _0223362A: ldr r0, [r4, #4] bl SysTask_Destroy add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_start ov12_02233638 @@ -12261,7 +12261,7 @@ _0223377C: mov r1, #0x32 mov r0, #0x15 lsl r1, r1, #6 - bl AllocFromHeap + bl Heap_Alloc str r0, [r7, #0x58] ldr r0, [sp, #0x18] ldr r2, [sp, #0x14] @@ -12327,7 +12327,7 @@ _0223380C: mov r1, #0x32 mov r0, #0x15 lsl r1, r1, #6 - bl AllocFromHeap + bl Heap_Alloc ldr r1, [sp, #0x14] mov r2, #0x32 add r1, #0x98 @@ -12364,7 +12364,7 @@ _02233854: ldr r0, [r4, #8] bl sub_02007534 ldr r0, [r5, #0x58] - bl FreeToHeap + bl Heap_Free str r7, [r5, #0x58] add r6, r6, #1 add r4, r4, #4 @@ -12374,7 +12374,7 @@ _02233854: ldr r0, [sp] add r0, #0x98 ldr r0, [r0] - bl FreeToHeap + bl Heap_Free ldr r0, [sp] mov r1, #0 add r0, #0x98 @@ -12911,7 +12911,7 @@ ov12_02233C94: ; 0x02233C94 mov r1, #0x28 add r6, r2, #0 add r7, r3, #0 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x28 add r4, r0, #0 @@ -13094,7 +13094,7 @@ _02233E0A: mov r1, #1 strb r1, [r0] add r0, r2, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl SysTask_Destroy pop {r4, pc} @@ -13202,7 +13202,7 @@ _02233ED8: mov r1, #1 strb r1, [r0] add r0, r2, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl SysTask_Destroy pop {r4, pc} @@ -13553,7 +13553,7 @@ ov12_0223419C: ; 0x0223419C add r5, r0, #0 mov r0, #0x15 mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x10 add r4, r0, #0 @@ -13660,7 +13660,7 @@ _0223428A: mov r1, #0 bl sub_0200C840 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _0223429E: @@ -14072,7 +14072,7 @@ _022345AC: lsl r0, r0, #4 bl PlaySE add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy pop {r3, r4, r5, pc} @@ -14195,7 +14195,7 @@ _02234672: bl sub_0200C644 mov r0, #0x15 mov r1, #0x34 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x34 add r4, r0, #0 @@ -14399,7 +14399,7 @@ ov12_0223483C: ; 0x0223483C strb r0, [r7] mov r0, #0x15 mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x10 @@ -14586,7 +14586,7 @@ _022349B8: mov r1, #1 strb r1, [r0] add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _022349CE: @@ -15757,7 +15757,7 @@ ov12_022352F4: ; 0x022352F4 mov r1, #0x14 add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x14 add r4, r0, #0 @@ -15930,7 +15930,7 @@ _02235452: mov r1, #1 strb r1, [r0] add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _02235464: @@ -16066,7 +16066,7 @@ _02235550: _02235576: mov r0, #0x15 mov r1, #0x28 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x28 add r4, r0, #0 @@ -16328,7 +16328,7 @@ _02235778: sub r0, r0, #1 strb r0, [r1] add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl SysTask_Destroy add sp, #0x10 @@ -16345,7 +16345,7 @@ ov12_022357B0: ; 0x022357B0 add r6, r1, #0 mov r0, #0x15 mov r1, #0xc - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0xc add r4, r0, #0 @@ -16370,7 +16370,7 @@ ov12_022357E4: ; 0x022357E4 ldr r0, [r4, #4] bl SysTask_Destroy add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 @@ -16427,7 +16427,7 @@ _02235846: beq _02235890 mov r0, #0x15 mov r1, #0x28 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x28 add r4, r0, #0 @@ -16695,7 +16695,7 @@ _02235A5E: sub r0, r0, #1 strb r0, [r1] add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl SysTask_Destroy _02235A80: @@ -17253,7 +17253,7 @@ ov12_02235E3C: ; 0x02235E3C mov r0, #0x15 mov r1, #0x10 add r5, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x10 @@ -17337,7 +17337,7 @@ _02235EDA: add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _02235EF8: @@ -17366,7 +17366,7 @@ ov12_02235F14: ; 0x02235F14 mov r1, #0x1c add r5, r2, #0 add r6, r3, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x1c @@ -17503,7 +17503,7 @@ _0223601A: add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _02236038: @@ -17534,7 +17534,7 @@ ov12_02236058: ; 0x02236058 mov r1, #0x1c add r5, r2, #0 add r7, r3, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x1c @@ -17731,7 +17731,7 @@ _022361DA: add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r6, #0 bl SysTask_Destroy _022361FE: @@ -17764,7 +17764,7 @@ ov12_02236228: ; 0x02236228 mov r1, #0x1c add r5, r2, #0 add r7, r3, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x1c @@ -17906,7 +17906,7 @@ _02236342: add r3, r2, #0 bl ov12_02240FB0 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r7, #0 bl SysTask_Destroy pop {r3, r4, r5, r6, r7, pc} @@ -17937,7 +17937,7 @@ ov12_02236388: ; 0x02236388 mov r1, #0x1c add r6, r2, #0 add r5, r3, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x1c @@ -18135,7 +18135,7 @@ _02236502: add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _02236520: @@ -18167,7 +18167,7 @@ ov12_02236540: ; 0x02236540 lsl r1, r1, #2 add r6, r2, #0 add r5, r3, #0 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x49 add r4, r0, #0 mov r1, #0 @@ -18833,7 +18833,7 @@ _02236A70: add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r6, #0 bl SysTask_Destroy _02236A8E: @@ -18865,7 +18865,7 @@ ov12_02236AB8: ; 0x02236AB8 mov r0, #0x15 mov r1, #0x14 add r5, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x14 @@ -19134,7 +19134,7 @@ _02236CB4: add r3, r1, #0 bl ov12_02231B4C add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _02236CE4: @@ -19208,7 +19208,7 @@ ov12_02236D50: ; 0x02236D50 add r1, #0xff add r6, r2, #0 add r5, r3, #0 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x45 add r4, r0, #0 mov r1, #0 @@ -19339,7 +19339,7 @@ _02236E48: add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _02236E66: @@ -19368,7 +19368,7 @@ ov12_02236E80: ; 0x02236E80 add r1, #0xff add r6, r2, #0 add r5, r3, #0 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x45 add r4, r0, #0 mov r1, #0 @@ -19690,7 +19690,7 @@ _022370D4: add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [sp, #4] bl SysTask_Destroy _022370F2: @@ -19724,7 +19724,7 @@ ov12_0223711C: ; 0x0223711C add r1, #0xff add r6, r2, #0 add r5, r3, #0 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x45 add r4, r0, #0 mov r1, #0 @@ -19886,7 +19886,7 @@ _0223724C: add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _0223726A: @@ -19915,7 +19915,7 @@ ov12_02237284: ; 0x02237284 add r1, #0xff add r6, r2, #0 add r5, r3, #0 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x45 add r4, r0, #0 mov r1, #0 @@ -20412,7 +20412,7 @@ _02237624: add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r6, #0 bl SysTask_Destroy _02237648: @@ -20446,7 +20446,7 @@ ov12_02237670: ; 0x02237670 add r1, #0xff add r6, r2, #0 add r5, r3, #0 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x45 add r4, r0, #0 mov r1, #0 @@ -20609,7 +20609,7 @@ _022377A0: add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _022377BE: @@ -20638,7 +20638,7 @@ ov12_022377D8: ; 0x022377D8 add r1, #0xf7 add r5, r2, #0 add r6, r3, #0 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x43 add r4, r0, #0 mov r1, #0 @@ -20992,7 +20992,7 @@ _02237A6A: add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [sp, #4] bl SysTask_Destroy _02237A88: @@ -21029,7 +21029,7 @@ ov12_02237ABC: ; 0x02237ABC add r1, #0xff add r6, r2, #0 add r5, r3, #0 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x45 add r4, r0, #0 mov r1, #0 @@ -21262,7 +21262,7 @@ _02237C6E: add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _02237C8C: @@ -21292,7 +21292,7 @@ ov12_02237CA8: ; 0x02237CA8 add r1, #0xff add r5, r2, #0 add r6, r3, #0 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x45 add r4, r0, #0 mov r1, #0 @@ -21393,7 +21393,7 @@ _02237D70: add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _02237D8E: @@ -21421,7 +21421,7 @@ ov12_02237DA8: ; 0x02237DA8 mov r0, #0x15 mov r1, #0x28 add r5, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x28 @@ -21569,7 +21569,7 @@ _02237EC2: add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _02237EE4: @@ -21646,7 +21646,7 @@ ov12_02237F5C: ; 0x02237F5C mov r1, #0x20 add r6, r2, #0 add r5, r3, #0 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x20 add r4, r0, #0 @@ -21762,7 +21762,7 @@ _02238040: add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _02238058: @@ -23912,7 +23912,7 @@ ov12_0223900C: ; 0x0223900C str r1, [sp, #4] mov r0, #0x15 mov r1, #0x32 - bl AllocFromHeap + bl Heap_Alloc add r7, r0, #0 ldr r1, [r6] ldr r0, _02239060 ; =0x00000127 @@ -23943,7 +23943,7 @@ _02239032: blt _02239032 _02239056: add r0, r7, #0 - bl FreeToHeap + bl Heap_Free add sp, #8 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -25172,7 +25172,7 @@ _02239858: add r6, #0x48 lsl r7, r4, #4 ldr r0, [r6, r7] - bl FreeToHeap + bl Heap_Free lsl r0, r4, #2 mov r1, #0 add r0, r5, r0 @@ -25258,7 +25258,7 @@ ov12_022398F8: ; 0x022398F8 mov r0, #0x16 mov r1, #0x18 add r7, r2, #0 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x18 add r4, r0, #0 @@ -25373,7 +25373,7 @@ _022399EE: sub r0, r0, #1 strb r0, [r1] add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _02239A08: @@ -25680,7 +25680,7 @@ ov12_02239C30: ; 0x02239C30 mov r1, #0x1c add r5, r2, #0 add r7, r3, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x1c @@ -25957,7 +25957,7 @@ _02239E6E: add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _02239E86: @@ -25989,7 +25989,7 @@ ov12_02239EAC: ; 0x02239EAC mov r1, #0x1c add r5, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x1c @@ -26098,7 +26098,7 @@ _02239F8E: add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy pop {r3, r4, r5, pc} @@ -26124,7 +26124,7 @@ ov12_02239FBC: ; 0x02239FBC mov r1, #0x1c add r5, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x1c @@ -26162,7 +26162,7 @@ ov12_0223A00C: ; 0x0223A00C mov r1, #0x1c add r5, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x1c @@ -26200,7 +26200,7 @@ ov12_0223A05C: ; 0x0223A05C mov r1, #0x1c add r5, r2, #0 add r6, r3, #0 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x1c add r4, r0, #0 @@ -26455,7 +26455,7 @@ _0223A248: add r3, r2, #0 bl ov12_02240FB0 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl SysTask_Destroy _0223A260: @@ -26485,7 +26485,7 @@ ov12_0223A27C: ; 0x0223A27C mov r1, #0x1c add r5, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x1c @@ -26601,7 +26601,7 @@ _0223A348: add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy pop {r3, r4, r5, pc} @@ -26628,7 +26628,7 @@ ov12_0223A39C: ; 0x0223A39C mov r0, #0x16 mov r1, #0x18 add r5, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x18 @@ -26828,7 +26828,7 @@ _0223A516: add r3, r2, #0 bl ov12_02240FB0 ldr r0, [sp] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl SysTask_Destroy _0223A530: @@ -26858,7 +26858,7 @@ ov12_0223A550: ; 0x0223A550 mov r0, #0x16 mov r1, #0x18 add r5, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x18 @@ -27078,7 +27078,7 @@ _0223A6F2: add r3, r2, #0 bl ov12_02240FB0 ldr r0, [sp] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl SysTask_Destroy _0223A70C: @@ -27109,7 +27109,7 @@ ov12_0223A72C: ; 0x0223A72C mov r1, #0x1c add r5, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x1c @@ -27207,7 +27207,7 @@ _0223A7F8: add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy pop {r3, r4, r5, pc} @@ -27234,7 +27234,7 @@ ov12_0223A828: ; 0x0223A828 mov r1, #0x1c add r5, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x1c @@ -27337,7 +27337,7 @@ _0223A8F8: add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy pop {r3, r4, r5, pc} @@ -27363,7 +27363,7 @@ ov12_0223A92C: ; 0x0223A92C mov r1, #0x58 add r5, r2, #0 add r7, r3, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x58 @@ -27530,7 +27530,7 @@ _0223AA8A: add r3, r2, #0 bl ov12_02240FB0 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl SysTask_Destroy _0223AAA2: @@ -28027,7 +28027,7 @@ ov12_0223AE58: ; 0x0223AE58 mov r1, #0x1c add r6, r2, #0 add r5, r3, #0 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x1c add r4, r0, #0 @@ -28152,7 +28152,7 @@ _0223AF58: add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _0223AF70: @@ -28180,7 +28180,7 @@ ov12_0223AF88: ; 0x0223AF88 mov r1, #0x18 add r5, r2, #0 add r6, r3, #0 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x18 add r4, r0, #0 @@ -28322,7 +28322,7 @@ _0223B0A8: add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _0223B0C0: @@ -28355,7 +28355,7 @@ ov12_0223B0EC: ; 0x0223B0EC mov r0, #0x16 mov r1, #0x1c add r5, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x1c @@ -28656,7 +28656,7 @@ _0223B316: add r3, r2, #0 bl ov12_02240FB0 ldr r0, [sp] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl SysTask_Destroy _0223B340: @@ -28694,7 +28694,7 @@ ov12_0223B37C: ; 0x0223B37C mov r1, #0x14 add r5, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x14 @@ -28737,7 +28737,7 @@ ov12_0223B3C8: ; 0x0223B3C8 add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _0223B3F0: @@ -28750,7 +28750,7 @@ ov12_0223B3F8: ; 0x0223B3F8 push {r4, lr} mov r0, #0x17 mov r1, #0xf4 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0xf4 add r4, r0, #0 @@ -28858,7 +28858,7 @@ ov12_0223B4C0: ; 0x0223B4C0 ldr r0, [r4, #0x18] bl sub_020117BC add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 @@ -28882,63 +28882,63 @@ ov12_0223B4F8: ; 0x0223B4F8 add r4, r0, #0 mov r0, #0x17 lsl r1, r1, #0xc - bl AllocFromHeap + bl Heap_Alloc add r1, r4, #0 add r1, #0xd0 str r0, [r1] mov r1, #6 mov r0, #0x17 lsl r1, r1, #0xc - bl AllocFromHeap + bl Heap_Alloc add r1, r4, #0 add r1, #0xd4 str r0, [r1] mov r1, #0x1b mov r0, #0x17 lsl r1, r1, #8 - bl AllocFromHeap + bl Heap_Alloc add r1, r4, #0 add r1, #0xd8 str r0, [r1] mov r1, #2 mov r0, #0x17 lsl r1, r1, #0xa - bl AllocFromHeap + bl Heap_Alloc add r1, r4, #0 add r1, #0xdc str r0, [r1] mov r1, #2 mov r0, #0x17 lsl r1, r1, #0xa - bl AllocFromHeap + bl Heap_Alloc add r1, r4, #0 add r1, #0xe0 str r0, [r1] mov r1, #2 mov r0, #0x17 lsl r1, r1, #0xa - bl AllocFromHeap + bl Heap_Alloc add r1, r4, #0 add r1, #0xe4 str r0, [r1] mov r1, #2 mov r0, #0x17 lsl r1, r1, #0xa - bl AllocFromHeap + bl Heap_Alloc add r1, r4, #0 add r1, #0xe8 str r0, [r1] mov r1, #2 mov r0, #0x17 lsl r1, r1, #8 - bl AllocFromHeap + bl Heap_Alloc add r1, r4, #0 add r1, #0xec str r0, [r1] mov r1, #2 mov r0, #0x17 lsl r1, r1, #8 - bl AllocFromHeap + bl Heap_Alloc add r1, r4, #0 add r1, #0xf0 str r0, [r1] @@ -28959,7 +28959,7 @@ ov12_0223B4F8: ; 0x0223B4F8 lsl r2, r2, #0xc bl MIi_CpuCopy32 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free mov r0, #0x17 str r0, [sp] mov r0, #0x2d @@ -28977,7 +28977,7 @@ ov12_0223B4F8: ; 0x0223B4F8 lsl r2, r2, #0xc bl MIi_CpuCopy32 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free mov r0, #0x17 str r0, [sp] mov r0, #0x2d @@ -28995,7 +28995,7 @@ ov12_0223B4F8: ; 0x0223B4F8 lsl r2, r2, #8 bl MIi_CpuCopy32 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free mov r0, #0x17 str r0, [sp] mov r0, #0x2d @@ -29013,7 +29013,7 @@ ov12_0223B4F8: ; 0x0223B4F8 lsl r2, r2, #0xa bl MIi_CpuCopy32 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free mov r0, #0x17 str r0, [sp] mov r0, #0x2d @@ -29031,7 +29031,7 @@ ov12_0223B4F8: ; 0x0223B4F8 lsl r2, r2, #0xa bl MIi_CpuCopy32 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free mov r0, #0x17 str r0, [sp] mov r0, #0x2d @@ -29049,7 +29049,7 @@ ov12_0223B4F8: ; 0x0223B4F8 lsl r2, r2, #0xa bl MIi_CpuCopy32 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free mov r0, #0x17 str r0, [sp] mov r0, #0x2d @@ -29067,7 +29067,7 @@ ov12_0223B4F8: ; 0x0223B4F8 lsl r2, r2, #0xa bl MIi_CpuCopy32 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [sp] add r0, r4, #0 @@ -29122,7 +29122,7 @@ _0223B718: add r0, r4, #0 add r0, #0xd0 ldr r0, [r0] - bl FreeToHeap + bl Heap_Free add r6, r6, #1 add r4, r4, #4 cmp r6, #3 @@ -29133,7 +29133,7 @@ _0223B72E: add r0, r4, #0 add r0, #0xdc ldr r0, [r0] - bl FreeToHeap + bl Heap_Free add r6, r6, #1 add r4, r4, #4 cmp r6, #4 @@ -29143,7 +29143,7 @@ _0223B742: add r0, r5, #0 add r0, #0xec ldr r0, [r0] - bl FreeToHeap + bl Heap_Free add r4, r4, #1 add r5, r5, #4 cmp r4, #2 @@ -29727,7 +29727,7 @@ ov12_0223BBC0: ; 0x0223BBC0 mov r0, #0x17 mov r1, #0x20 add r5, r3, #0 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x20 add r4, r0, #0 @@ -29797,10 +29797,10 @@ ov12_0223BC44: ; 0x0223BC44 ldr r0, [r4, #8] cmp r0, #0 beq _0223BC58 - bl FreeToHeap + bl Heap_Free _0223BC58: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #1 pop {r4, pc} _0223BC62: @@ -34895,7 +34895,7 @@ ov12_0223E32C: ; 0x0223E32C _0223E33E: mov r0, #0x17 mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x10 add r4, r0, #0 @@ -34942,7 +34942,7 @@ ov12_0223E38C: ; 0x0223E38C mov r0, #0x21 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free mov r0, #0x21 mov r1, #0 lsl r0, r0, #4 @@ -35199,7 +35199,7 @@ ov12_0223E598: ; 0x0223E598 strb r0, [r7] mov r0, #0x17 mov r1, #0x2c - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x2c add r4, r0, #0 @@ -35316,7 +35316,7 @@ _0223E686: add r2, r1, #0 bl ov12_0223CD38 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy pop {r3, r4, r5, pc} @@ -35392,7 +35392,7 @@ _0223E720: mov r1, #1 strb r1, [r0] add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy pop {r3, r4, r5, pc} @@ -36246,7 +36246,7 @@ ov12_0223EDAC: ; 0x0223EDAC add r6, r2, #0 str r3, [sp, #4] ldr r5, [sp, #0x28] - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x14 add r4, r0, #0 @@ -36324,7 +36324,7 @@ _0223EE30: strb r0, [r1] _0223EE5E: add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r6, #0 bl SysTask_Destroy _0223EE6A: @@ -36424,7 +36424,7 @@ ov12_0223EEFC: ; 0x0223EEFC mov r0, #0x17 mov r1, #0x18 add r5, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x18 @@ -36624,7 +36624,7 @@ _0223F076: add r3, r2, #0 bl ov12_02240FB0 ldr r0, [sp] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl SysTask_Destroy _0223F090: @@ -36654,7 +36654,7 @@ ov12_0223F0B0: ; 0x0223F0B0 mov r0, #0x17 mov r1, #0x18 add r5, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x18 @@ -36881,7 +36881,7 @@ _0223F266: add r3, r2, #0 bl ov12_02240FB0 ldr r0, [sp] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl SysTask_Destroy _0223F280: @@ -36911,7 +36911,7 @@ ov12_0223F2A0: ; 0x0223F2A0 mov r0, #0x17 mov r1, #0x14 add r5, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x14 @@ -37027,7 +37027,7 @@ _0223F388: add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _0223F3A0: @@ -37103,7 +37103,7 @@ ov12_0223F414: ; 0x0223F414 lsl r1, r1, #2 add r5, r2, #0 str r3, [sp, #4] - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x57 add r4, r0, #0 mov r1, #0 @@ -37238,7 +37238,7 @@ ov12_0223F524: ; 0x0223F524 add r6, r1, #0 mov r0, #0x17 mov r1, #0x14 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x14 add r4, r0, #0 @@ -37263,7 +37263,7 @@ ov12_0223F558: ; 0x0223F558 ldr r0, [r4] bl SysTask_Destroy add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 @@ -37888,7 +37888,7 @@ _0223FA4C: cmp r6, #4 blt _0223FA4C add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [sp, #0x18] bl SysTask_Destroy _0223FA66: @@ -38397,7 +38397,7 @@ ov12_0223FDE8: ; 0x0223FDE8 add r1, #0xed add r5, r2, #0 add r6, r3, #0 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x41 mov r1, #0 lsl r2, r2, #2 @@ -38672,7 +38672,7 @@ _02240002: add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _0224001A: @@ -38974,7 +38974,7 @@ ov12_02240288: ; 0x02240288 mov r1, #0x50 add r5, r2, #0 add r6, r3, #0 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x50 add r4, r0, #0 @@ -39056,7 +39056,7 @@ _02240330: add r3, r2, #0 bl ov12_02240FB0 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl SysTask_Destroy pop {r3, r4, r5, pc} @@ -39084,7 +39084,7 @@ ov12_02240364: ; 0x02240364 mov r1, #0x50 add r5, r2, #0 add r6, r3, #0 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x50 add r4, r0, #0 @@ -39214,7 +39214,7 @@ _0224044E: add r3, r2, #0 bl ov12_02240FB0 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl SysTask_Destroy _02240484: @@ -39243,7 +39243,7 @@ ov12_022404A0: ; 0x022404A0 mov r1, #0x20 add r6, r2, #0 add r5, r3, #0 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x20 add r4, r0, #0 @@ -39371,7 +39371,7 @@ _022405A4: add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _022405BC: @@ -39472,7 +39472,7 @@ ov12_02240658: ; 0x02240658 mov r1, #0x54 add r5, r2, #0 add r6, r3, #0 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x54 add r4, r0, #0 @@ -39597,7 +39597,7 @@ _0224074E: add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _02240766: @@ -41102,7 +41102,7 @@ ov12_02241210: ; 0x02241210 mov r0, #3 mov r1, #0x18 lsl r2, r2, #0x10 - bl CreateHeap + bl Heap_Create mov r1, #0x4a add r0, r4, #0 lsl r1, r1, #6 @@ -41552,7 +41552,7 @@ _022415D4: ldr r0, [r0] bl DestroyMsgData ldr r0, [r4, #0x30] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #4] bl SysTask_Destroy ldr r0, [r4, #8] @@ -41577,7 +41577,7 @@ _022415D4: bl Main_SetVBlankIntrCB bl sub_02015F1C mov r0, #0x18 - bl DestroyHeap + bl Heap_Destroy bl sub_02083404 mov r1, #5 mov r2, #2 @@ -43328,7 +43328,7 @@ _0224247A: mov r1, #0x32 mov r0, #0x18 lsl r1, r1, #6 - bl AllocFromHeap + bl Heap_Alloc lsl r2, r6, #4 add r1, r5, r2 add r1, #0xd8 @@ -43382,7 +43382,7 @@ _022424DE: add r0, r4, #0 add r0, #0xc8 ldr r0, [r0] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 add r0, #0xc8 add r6, r6, #1 @@ -44342,7 +44342,7 @@ ov12_02242CB0: ; 0x02242CB0 add r5, r0, #0 mov r0, #0x18 mov r1, #8 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #8 add r6, r0, #0 @@ -44383,7 +44383,7 @@ ov12_02242CF8: ; 0x02242CF8 cmp r2, #1 bne _02242D14 add r0, r1, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl SysTask_Destroy pop {r4, pc} @@ -44414,7 +44414,7 @@ ov12_02242D3C: ; 0x02242D3C add r5, r0, #0 mov r0, #0x18 mov r1, #0x20 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x20 @@ -44524,7 +44524,7 @@ _02242E2C: ldr r0, [r4, #4] bl sub_0200C3DC add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy pop {r3, r4, r5, pc} @@ -45047,7 +45047,7 @@ ov12_0224324C: ; 0x0224324C strb r0, [r7] mov r0, #0x18 mov r1, #0x14 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x14 @@ -45150,7 +45150,7 @@ _02243322: mov r2, #1 strb r2, [r0] add r0, r1, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl SysTask_Destroy pop {r3, r4, r5, pc} @@ -45224,7 +45224,7 @@ _022433B2: mov r2, #1 strb r2, [r0] add r0, r1, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl SysTask_Destroy pop {r3, r4, r5, pc} @@ -45243,7 +45243,7 @@ ov12_022433CC: ; 0x022433CC mov r1, #0x14 add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x14 add r4, r0, #0 @@ -45333,7 +45333,7 @@ _0224348E: mov r1, #1 strb r1, [r0] add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy pop {r3, r4, r5, pc} @@ -45389,7 +45389,7 @@ _022434F0: mov r1, #1 strb r1, [r0] add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy pop {r3, r4, r5, pc} @@ -46222,7 +46222,7 @@ ov12_02243B1C: ; 0x02243B1C add r7, r1, #0 add r1, r0, #0 add r5, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x18 @@ -46422,7 +46422,7 @@ _02243C96: add r3, r2, #0 bl ov12_02240FB0 ldr r0, [sp] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl SysTask_Destroy _02243CB0: @@ -46452,7 +46452,7 @@ ov12_02243CD0: ; 0x02243CD0 add r7, r1, #0 add r1, r0, #0 add r5, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x18 @@ -46672,7 +46672,7 @@ _02243E72: add r3, r2, #0 bl ov12_02240FB0 ldr r0, [sp] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl SysTask_Destroy _02243E8C: @@ -46729,7 +46729,7 @@ ov12_02243ED8: ; 0x02243ED8 mov r1, #0x20 add r6, r2, #0 add r5, r3, #0 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x20 add r4, r0, #0 @@ -46858,7 +46858,7 @@ _02243FDE: add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _02243FF6: @@ -46895,7 +46895,7 @@ _0224401C: bne _0224401C mov r0, #0x18 mov r1, #0x14 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x14 @@ -47078,7 +47078,7 @@ _0224419A: add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _022441B2: @@ -47111,7 +47111,7 @@ ov12_022441DC: ; 0x022441DC add r1, r0, #0 add r6, r2, #0 add r5, r3, #0 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x18 add r4, r0, #0 @@ -47216,7 +47216,7 @@ _022442A6: add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _022442BE: @@ -47243,7 +47243,7 @@ ov12_022442D4: ; 0x022442D4 add r1, r0, #0 add r5, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x18 @@ -47401,7 +47401,7 @@ _02244414: add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _0224442C: @@ -47432,7 +47432,7 @@ ov12_0224444C: ; 0x0224444C mov r1, #0x24 add r6, r2, #0 add r7, r3, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x24 @@ -47651,7 +47651,7 @@ _022445E8: add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _02244600: @@ -47681,7 +47681,7 @@ ov12_02244624: ; 0x02244624 mov r0, #0x18 mov r1, #0x14 add r5, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x14 @@ -47774,7 +47774,7 @@ _022446E8: add r3, r2, #0 bl ov12_02240FB0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _02244700: @@ -47926,7 +47926,7 @@ _022447FA: ldr r0, [sp, #0x60] str r0, [sp, #0x30] mov r0, ip - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x18 str r0, [sp] @@ -47974,7 +47974,7 @@ _02244874: ldr r0, [r6, #0x14] bl SysTask_Destroy add r0, r6, #0 - bl FreeToHeap + bl Heap_Free pop {r4, r5, r6, pc} thumb_func_start ov12_02244890 diff --git a/arm9/overlays/13/asm/overlay_13_init.s b/arm9/overlays/13/asm/overlay_13_init.s index bb1be5576..c6d1b6d15 100644 --- a/arm9/overlays/13/asm/overlay_13_init.s +++ b/arm9/overlays/13/asm/overlay_13_init.s @@ -15,13 +15,13 @@ ov13_02211E60: ; 0x02211E60 add r5, r0, #0 add r0, r4, #0 lsl r1, r1, #0x12 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #1 mov r2, #0 bl ov13_02223494 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl OS_RestoreInterrupts ldr r1, _02211EA0 ; =0x04000208 diff --git a/arm9/overlays/14/asm/overlay_14.s b/arm9/overlays/14/asm/overlay_14.s index 2382b6f56..9c14c9786 100644 --- a/arm9/overlays/14/asm/overlay_14.s +++ b/arm9/overlays/14/asm/overlay_14.s @@ -11,12 +11,12 @@ StoragePC_Overlay_Init: ; 0x021D74E0 mov r0, #3 mov r1, #9 lsl r2, r2, #0xe - bl CreateHeap + bl Heap_Create mov r2, #0xf mov r0, #3 mov r1, #0xa lsl r2, r2, #0xe - bl CreateHeap + bl Heap_Create mov r1, #0x87 add r0, r5, #0 lsl r1, r1, #2 @@ -132,9 +132,9 @@ _021D75DE: add r0, r4, #0 bl ov14_021DB398 mov r0, #9 - bl DestroyHeap + bl Heap_Destroy mov r0, #0xa - bl DestroyHeap + bl Heap_Destroy mov r0, #1 pop {r4, pc} .align 2, 0 @@ -5546,7 +5546,7 @@ _021DA1FE: ldr r0, [r4, r0] bl ov14_021DCA38 mov r0, #0xa - bl DestroyHeap + bl Heap_Destroy mov r0, #0x12 lsl r0, r0, #4 ldr r0, [r4, r0] @@ -5592,7 +5592,7 @@ _021DA256: mov r0, #3 mov r1, #0xa lsl r2, r2, #0xe - bl CreateHeap + bl Heap_Create mov r2, #0x12 lsl r2, r2, #4 ldr r0, [r4, r2] @@ -5658,7 +5658,7 @@ _021DA2F2: ldr r0, [r5, r0] bl ov14_021DCA38 mov r0, #0xa - bl DestroyHeap + bl Heap_Destroy add r0, r5, #0 bl ov14_021D83E4 mov r1, #0x4b @@ -5693,7 +5693,7 @@ _021DA334: mov r0, #3 mov r1, #0xa lsl r2, r2, #0xe - bl CreateHeap + bl Heap_Create add r0, r5, #0 bl ov14_021DC3F4 cmp r0, #1 @@ -5803,7 +5803,7 @@ _021DA41E: ldr r0, [r4, r0] bl ov14_021DCA38 mov r0, #0xa - bl DestroyHeap + bl Heap_Destroy mov r0, #0x47 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -5859,7 +5859,7 @@ _021DA498: mov r0, #0x85 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free ldr r0, _021DA5DC ; =SDK_OVERLAY_OVERLAY_75_ID bl UnloadOverlayByID ldr r0, _021DA5E4 ; =ov14_021E6A00 @@ -5889,7 +5889,7 @@ _021DA4F4: mov r0, #3 mov r1, #0xa lsl r2, r2, #0xe - bl CreateHeap + bl Heap_Create mov r0, #0x45 lsl r0, r0, #2 add r0, r4, r0 @@ -7579,7 +7579,7 @@ ov14_021DB220: ; 0x021DB220 bl SizeOfStructPokemon add r1, r0, #0 mov r0, #9 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x1a lsl r1, r1, #4 str r0, [r5, r1] @@ -7697,7 +7697,7 @@ ov14_021DB398: ; 0x021DB398 ldr r0, [r4, r0] cmp r0, #0 beq _021DB3BE - bl FreeToHeap + bl Heap_Free _021DB3BE: mov r0, #0x67 lsl r0, r0, #2 @@ -7736,7 +7736,7 @@ _021DB3BE: add r0, #0xa4 bl ov14_021DB558 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 @@ -7795,7 +7795,7 @@ ov14_021DB470: ; 0x021DB470 mov r1, #0x1e mov r0, #9 mul r1, r2 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4] mov r0, #0 strb r0, [r4, #8] @@ -7805,11 +7805,11 @@ ov14_021DB470: ; 0x021DB470 thumb_func_start ov14_021DB490 ov14_021DB490: ; 0x021DB490 - ldr r3, _021DB498 ; =FreeToHeap + ldr r3, _021DB498 ; =Heap_Free ldr r0, [r0] bx r3 nop -_021DB498: .word FreeToHeap +_021DB498: .word Heap_Free thumb_func_start ov14_021DB49C ov14_021DB49C: ; 0x021DB49C @@ -10473,7 +10473,7 @@ ov14_021DC76C: ; 0x021DC76C ldr r1, _021DC9C8 ; =0x0000B3B4 mov r0, #0xa add r6, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _021DC79A mov r0, #0x16 @@ -10854,9 +10854,9 @@ ov14_021DCA38: ; 0x021DCA38 mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 - bl FreeToHeap + bl Heap_Free bl DeinitOamData pop {r4, pc} .align 2, 0 @@ -10890,7 +10890,7 @@ _021DCB3A: ldr r1, [sp] mov r0, #0xa add r1, #0x14 - bl AllocFromHeap + bl Heap_Alloc add r1, r0, #0 beq _021DCB78 str r6, [r1] @@ -10982,7 +10982,7 @@ ov14_021DCBD8: ; 0x021DCBD8 add r0, r4, r0 str r1, [r0, #8] add r0, r5, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, pc} thumb_func_start ov14_021DCBFC @@ -13443,7 +13443,7 @@ ov14_021DDEF4: ; 0x021DDEF4 ldr r5, _021DDF2C ; =ov14_021E6A10 _021DDF06: ldr r0, [r5, #8] - bl FreeToHeap + bl Heap_Free ldr r1, [r5] cmp r1, #0 beq _021DDF16 @@ -13785,7 +13785,7 @@ _021DE17E: lsl r1, r1, #4 bl DC_FlushRange ldr r0, [sp, #4] - bl FreeToHeap + bl Heap_Free _021DE1C0: add sp, #0xc pop {r4, r5, r6, r7, pc} @@ -13853,7 +13853,7 @@ ov14_021DE1D0: ; 0x021DE1D0 sub r3, r3, r5 bl AddTextPrinterParameterized2 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _021DE250: ldr r3, [sp, #0x14] ldr r0, _021DE270 ; =0x00005984 @@ -13865,7 +13865,7 @@ _021DE250: bl BG_LoadCharTilesData _021DE262: ldr r0, [sp, #0x10] - bl FreeToHeap + bl Heap_Free _021DE268: add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} @@ -13911,7 +13911,7 @@ ov14_021DE278: ; 0x021DE278 bl ov14_021DECD4 _021DE2C2: ldr r0, [sp, #4] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [sp] ldr r0, _021DE2E4 ; =0x00005984 @@ -14481,7 +14481,7 @@ ov14_021DE730: ; 0x021DE730 mov r1, #0x10 add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _021DE782 str r5, [r4] @@ -14511,7 +14511,7 @@ _021DE764: pop {r3, r4, r5, r6, r7, pc} _021DE77C: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _021DE782: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -16076,14 +16076,14 @@ ov14_021DF3A8: ; 0x021DF3A8 ldr r0, [r4, #0x14] cmp r0, #0 beq _021DF3BA - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #0x14] _021DF3BA: ldr r0, [r4, #0x18] cmp r0, #0 beq _021DF3C8 - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #0x18] _021DF3C8: @@ -16954,7 +16954,7 @@ ov14_021DFA7C: ; 0x021DFA7C mov r1, #0x2c add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _021DFAFC add r0, r6, #0 @@ -17005,7 +17005,7 @@ ov14_021DFA7C: ; 0x021DFA7C pop {r3, r4, r5, r6, r7, pc} _021DFAF6: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _021DFAFC: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} @@ -18688,7 +18688,7 @@ _021E0806: bl NNS_G2dLoadPalette _021E0812: ldr r0, [sp, #0xc] - bl FreeToHeap + bl Heap_Free _021E0818: mov r0, #0xa add r3, r5, #0 @@ -18760,28 +18760,28 @@ ov14_021E089C: ; 0x021E089C ldr r0, [r4, #8] cmp r0, #0 beq _021E08AE - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #8] _021E08AE: ldr r0, [r4] cmp r0, #0 beq _021E08BC - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4] _021E08BC: ldr r0, [r4, #0x14] cmp r0, #0 beq _021E08CA - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #0x14] _021E08CA: ldr r0, [r4, #0x18] cmp r0, #0 beq _021E08D8 - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #0x18] _021E08D8: @@ -19362,14 +19362,14 @@ ov14_021E0D3C: ; 0x021E0D3C ldr r0, [r4, #8] cmp r0, #0 beq _021E0D4E - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #8] _021E0D4E: ldr r0, [r4, #0xc] cmp r0, #0 beq _021E0D5C - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #0xc] _021E0D5C: @@ -19509,7 +19509,7 @@ _021E0E58: cmp r6, #4 blt _021E0E58 ldr r0, [r5, #4] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r5, #4] _021E0E72: @@ -19543,7 +19543,7 @@ _021E0EA8: ldr r0, [r5, #0x28] cmp r0, #0 beq _021E0EB2 - bl FreeToHeap + bl Heap_Free _021E0EB2: ldr r0, [r5, #0x30] cmp r0, #0 @@ -19553,7 +19553,7 @@ _021E0EBC: ldr r0, [r5, #0x34] cmp r0, #0 beq _021E0EC6 - bl FreeToHeap + bl Heap_Free _021E0EC6: mov r6, #0 add r4, r5, #0 @@ -19807,7 +19807,7 @@ ov14_021E10B0: ; 0x021E10B0 bne _021E10EE mov r0, #0xa mov r1, #0xc - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _021E10EA ldr r0, [r5, #0x10] @@ -19843,7 +19843,7 @@ ov14_021E10F4: ; 0x021E10F4 cmp r0, #0 beq _021E1110 bl sub_0201B6C8 - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x4c] bl SysTask_Destroy mov r0, #0 @@ -20719,7 +20719,7 @@ _021E17D2: ldr r0, [r5, #0x24] cmp r0, #0 beq _021E17EC - bl FreeToHeap + bl Heap_Free _021E17EC: ldr r0, [r5, #0x14] cmp r0, #0 @@ -20737,7 +20737,7 @@ _021E1800: bl String_Delete _021E180A: ldr r0, [r5, #0x18] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r5, #0x18] _021E1814: @@ -21457,7 +21457,7 @@ ov14_021E1D38: ; 0x021E1D38 mov r2, #0x40 bl MIi_CpuCopy16 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #0x12 mov r1, #0x14 add r2, sp, #0x14 @@ -21472,7 +21472,7 @@ ov14_021E1D38: ; 0x021E1D38 mov r2, #0x20 bl MIi_CpuCopy16 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 mov r1, #0x2a mov r4, #1 @@ -21667,22 +21667,22 @@ _021E1F30: ldr r0, [r5, #0x14] cmp r0, #0 beq _021E1F3A - bl FreeToHeap + bl Heap_Free _021E1F3A: ldr r0, [r5, #0x1c] cmp r0, #0 beq _021E1F44 - bl FreeToHeap + bl Heap_Free _021E1F44: ldr r0, [r5, #0x2c] cmp r0, #0 beq _021E1F4E - bl FreeToHeap + bl Heap_Free _021E1F4E: ldr r0, [r5, #0x34] cmp r0, #0 beq _021E1F58 - bl FreeToHeap + bl Heap_Free _021E1F58: ldr r0, [r5, #0x44] cmp r0, #0 @@ -21709,7 +21709,7 @@ _021E1F78: cmp r6, #3 blt _021E1F78 ldr r0, [r5, #0x10] - bl FreeToHeap + bl Heap_Free _021E1F8E: pop {r4, r5, r6, pc} .align 2, 0 @@ -22358,7 +22358,7 @@ ov14_021E247C: ; 0x021E247C add r6, r1, #0 mov r0, #0xa mov r1, #0xc - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _021E24B6 ldr r0, _021E24B8 ; =ov14_021E6624 @@ -22378,7 +22378,7 @@ ov14_021E247C: ; 0x021E247C cmp r0, #0 bne _021E24B6 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _021E24B6: pop {r4, r5, r6, pc} .align 2, 0 @@ -22393,7 +22393,7 @@ ov14_021E24BC: ; 0x021E24BC add r0, #0xdc str r2, [r0] add r0, r1, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl SysTask_Destroy pop {r4, pc} @@ -22672,7 +22672,7 @@ ov14_021E26E4: ; 0x021E26E4 add r5, r0, #0 mov r0, #0xa mov r1, #0x18 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _021E2798 ldr r0, [r5, #0xc] @@ -22840,7 +22840,7 @@ ov14_021E283C: ; 0x021E283C add r5, r0, #0 mov r0, #0xa mov r1, #0x18 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _021E287C mov r1, #0 @@ -23046,7 +23046,7 @@ ov14_021E2940: ; 0x021E2940 bl sub_02020248 _021E29F0: add r0, r6, #0 - bl FreeToHeap + bl Heap_Free _021E29F6: add sp, #0x54 pop {r3, r4, r5, r6, pc} @@ -23132,7 +23132,7 @@ _021E2A74: mov r1, #9 mov r0, #0xa lsl r1, r1, #6 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x1c] mov r0, #0xa add r3, r5, #0 @@ -23166,12 +23166,12 @@ ov14_021E2AC8: ; 0x021E2AC8 ldr r0, [r4, #0x14] cmp r0, #0 beq _021E2AD6 - bl FreeToHeap + bl Heap_Free _021E2AD6: ldr r0, [r4, #0x1c] cmp r0, #0 beq _021E2AE0 - bl FreeToHeap + bl Heap_Free _021E2AE0: add r0, r4, #0 bl ov14_021E3390 @@ -24391,7 +24391,7 @@ ov14_021E33C8: ; 0x021E33C8 _021E33E4: mov r0, #0xa mov r1, #0xf4 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _021E3460 ldr r0, [sp] @@ -24515,28 +24515,28 @@ ov14_021E34C0: ; 0x021E34C0 ldr r0, [r0] cmp r0, #0 beq _021E34DA - bl FreeToHeap + bl Heap_Free _021E34DA: add r0, r6, #0 add r0, #0xa0 ldr r0, [r0] cmp r0, #0 beq _021E34E8 - bl FreeToHeap + bl Heap_Free _021E34E8: add r0, r6, #0 add r0, #0xa8 ldr r0, [r0] cmp r0, #0 beq _021E34F6 - bl FreeToHeap + bl Heap_Free _021E34F6: add r0, r6, #0 add r0, #0xb0 ldr r0, [r0] cmp r0, #0 beq _021E3504 - bl FreeToHeap + bl Heap_Free _021E3504: ldr r0, [r6, #0x2c] cmp r0, #0 @@ -24580,7 +24580,7 @@ _021E354A: cmp r5, #0xa blt _021E3540 add r0, r6, #0 - bl FreeToHeap + bl Heap_Free _021E3558: pop {r4, r5, r6, pc} .align 2, 0 @@ -24955,7 +24955,7 @@ _021E3838: b _021E3852 _021E384A: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, r6, r7, pc} _021E3852: str r6, [r5, #0x10] @@ -26233,7 +26233,7 @@ ov14_021E41C0: ; 0x021E41C0 add r4, r0, #0 mov r0, #0xa lsl r1, r1, #4 - bl AllocFromHeap + bl Heap_Alloc add r5, r0, #0 beq _021E4208 mov r1, #0x73 @@ -26261,7 +26261,7 @@ _021E41EA: cmp r0, #0 bne _021E4208 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free _021E4208: pop {r3, r4, r5, pc} nop @@ -26529,7 +26529,7 @@ ov14_021E43E8: ; 0x021E43E8 add r4, r0, #0 mov r0, #0xa lsl r1, r1, #4 - bl AllocFromHeap + bl Heap_Alloc add r5, r0, #0 beq _021E4436 add r0, r4, #0 @@ -26560,7 +26560,7 @@ _021E4418: cmp r0, #0 bne _021E4436 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free _021E4436: pop {r3, r4, r5, pc} .align 2, 0 @@ -26660,7 +26660,7 @@ ov14_021E44E0: ; 0x021E44E0 add r4, r0, #0 mov r0, #0xa lsl r1, r1, #4 - bl AllocFromHeap + bl Heap_Alloc add r5, r0, #0 beq _021E4528 mov r1, #0x73 @@ -26688,7 +26688,7 @@ _021E450A: cmp r0, #0 bne _021E4528 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free _021E4528: pop {r3, r4, r5, pc} nop @@ -26939,7 +26939,7 @@ ov14_021E46E4: ; 0x021E46E4 add r4, r0, #0 mov r0, #0xa lsl r1, r1, #4 - bl AllocFromHeap + bl Heap_Alloc add r5, r0, #0 beq _021E472C mov r1, #0x73 @@ -26967,7 +26967,7 @@ _021E470E: cmp r0, #0 bne _021E472C add r0, r5, #0 - bl FreeToHeap + bl Heap_Free _021E472C: pop {r3, r4, r5, pc} nop @@ -27108,7 +27108,7 @@ ov14_021E4828: ; 0x021E4828 mov r1, #0x3c add r6, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _021E487C str r5, [r4, #4] @@ -27150,7 +27150,7 @@ ov14_021E4880: ; 0x021E4880 add r4, r0, #0 bl ov14_021E495C add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_start ov14_021E4890 @@ -27230,7 +27230,7 @@ _021E48EA: cmp r7, #3 blt _021E48EA ldr r0, [sp, #8] - bl FreeToHeap + bl Heap_Free add sp, #0x58 pop {r3, r4, r5, r6, r7, pc} _021E4940: @@ -27673,7 +27673,7 @@ ov14_021E4C98: ; 0x021E4C98 mov r1, #0x34 add r6, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _021E4D1A lsl r0, r7, #2 @@ -27725,7 +27725,7 @@ ov14_021E4C98: ; 0x021E4C98 pop {r3, r4, r5, r6, r7, pc} _021E4D14: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _021E4D1A: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -28171,7 +28171,7 @@ _021E5064: mov r1, #0xe1 mov r0, #0xa lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _021E50E6 str r6, [r4, #4] @@ -28240,11 +28240,11 @@ ov14_021E50EC: ; 0x021E50EC mov r0, #0x37 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free mov r0, #0xdd lsl r0, r0, #2 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x70] bl DestroyMsgData add r0, r4, #0 @@ -28254,7 +28254,7 @@ ov14_021E50EC: ; 0x021E50EC ldr r0, [r4, #0x74] bl String_Delete add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _021E5124: pop {r4, pc} .align 2, 0 @@ -29666,10 +29666,10 @@ _021E5C30: bl sub_0201FFC8 ldr r0, [sp] ldr r0, [r0, #0x5c] - bl FreeToHeap + bl Heap_Free ldr r0, [sp] ldr r0, [r0, #0x64] - bl FreeToHeap + bl Heap_Free add sp, #8 pop {r3, r4, r5, r6, r7, pc} diff --git a/arm9/overlays/15/asm/overlay_15.s b/arm9/overlays/15/asm/overlay_15.s index ca9f60e0a..a488a05d7 100644 --- a/arm9/overlays/15/asm/overlay_15.s +++ b/arm9/overlays/15/asm/overlay_15.s @@ -23,12 +23,12 @@ _021D74F2: mov r0, #3 mov r1, #0x22 lsl r2, r2, #0xe - bl CreateHeap + bl Heap_Create mov r2, #0xa mov r0, #3 mov r1, #0x23 lsl r2, r2, #0xe - bl CreateHeap + bl Heap_Create add r0, r5, #0 bl ov15_021D7628 ldr r0, [r0, #0x14] @@ -170,9 +170,9 @@ ov15_021D7608: ; 0x021D7608 add r1, r4, #0 bl ov15_021D7774 mov r0, #0x22 - bl DestroyHeap + bl Heap_Destroy mov r0, #0x23 - bl DestroyHeap + bl Heap_Destroy mov r0, #1 pop {r4, pc} .align 2, 0 @@ -2583,7 +2583,7 @@ ov15_021D87F8: ; 0x021D87F8 add r5, r0, #0 mov r0, #0x23 lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _021D8878 mov r0, #0 @@ -2668,9 +2668,9 @@ _021D88A4: ldr r0, [r6, #0x24] bl sub_0201FD58 ldr r0, [r6, #0x20] - bl FreeToHeap + bl Heap_Free add r0, r6, #0 - bl FreeToHeap + bl Heap_Free _021D88CE: pop {r4, r5, r6, pc} @@ -2712,7 +2712,7 @@ ov15_021D8900: ; 0x021D8900 bhs _021D894E mov r0, #0x23 mov r1, #0x18 - bl AllocFromHeap + bl Heap_Alloc add r1, r0, #0 beq _021D8952 mov r4, #0 @@ -2809,7 +2809,7 @@ ov15_021D8998: ; 0x021D8998 add r0, r1, r0 str r2, [r0, #8] add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 @@ -3061,14 +3061,14 @@ _021D8BD8: ldr r0, [r5, r0] cmp r0, #0 beq _021D8BE6 - bl FreeToHeap + bl Heap_Free _021D8BE6: mov r0, #0x76 lsl r0, r0, #2 ldr r0, [r5, r0] cmp r0, #0 beq _021D8BF4 - bl FreeToHeap + bl Heap_Free _021D8BF4: add r4, r4, #1 add r5, r5, #4 @@ -4325,7 +4325,7 @@ ov15_021D95E8: ; 0x021D95E8 mov r0, #0x23 lsl r1, r1, #4 add r7, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 str r5, [r4] str r6, [r4, #4] @@ -4396,7 +4396,7 @@ _021D9674: add r0, #0x2c bl RemoveWindow add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_start ov15_021D9694 @@ -4585,7 +4585,7 @@ ov15_021D97E4: ; 0x021D97E4 lsl r1, r1, #6 bl DC_FlushRange add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0xc pop {r4, r5, pc} @@ -5564,7 +5564,7 @@ ov15_021D9FA0: ; 0x021D9FA0 mov r0, #0x23 mov r1, #0x10 add r6, r2, #0 - bl AllocFromHeap + bl Heap_Alloc str r5, [r0] str r4, [r0, #4] str r6, [r0, #8] @@ -5582,7 +5582,7 @@ ov15_021D9FBC: ; 0x021D9FBC bl sub_0201FFC8 _021D9FCA: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 @@ -5816,7 +5816,7 @@ ov15_021DA18C: ; 0x021DA18C mov r0, #0x23 mov r1, #0x60 add r7, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 str r5, [r4] str r6, [r4, #4] @@ -5841,7 +5841,7 @@ ov15_021DA1B8: ; 0x021DA1B8 bl sub_0201FFC8 _021DA1C6: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 @@ -6657,7 +6657,7 @@ ov15_021DA828: ; 0x021DA828 mov r0, #0x23 mov r1, #0x94 add r7, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 str r5, [r4] str r6, [r4, #4] @@ -6739,7 +6739,7 @@ _021DA8D0: add r0, #0x10 bl RemoveWindow add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_start ov15_021DA8E8 @@ -7451,7 +7451,7 @@ ov15_021DAE68: ; 0x021DAE68 mov r0, #0x23 lsl r1, r1, #8 add r7, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 str r5, [r4] str r6, [r4, #4] @@ -7478,7 +7478,7 @@ ov15_021DAEA4: ; 0x021DAEA4 add r4, r0, #0 bl ov15_021DB200 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_start ov15_021DAEB4 @@ -7625,7 +7625,7 @@ _021DAFB8: mov r1, #0x9a bl DC_FlushRange add r0, r7, #0 - bl FreeToHeap + bl Heap_Free _021DAFE6: add r6, r6, #1 add r4, r4, #2 @@ -7734,7 +7734,7 @@ ov15_021DAFF8: ; 0x021DAFF8 mov r1, #4 bl BG_LoadCharTilesData ldr r0, [sp, #8] - bl FreeToHeap + bl Heap_Free _021DB0D4: add r0, r6, #0 bl String_Delete @@ -7925,9 +7925,9 @@ ov15_021DB258: ; 0x021DB258 push {r4, lr} add r4, r0, #0 ldr r0, [r4] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #8] - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 @@ -7988,7 +7988,7 @@ ov15_021DB2D0: ; 0x021DB2D0 add r5, r0, #0 mov r0, #0x23 mov r1, #0x18 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _021DB32C ldr r0, [r5, #4] @@ -8239,7 +8239,7 @@ _021DB4CC: mov r2, #0 str r2, [r1, r0] add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _021DB4E0: diff --git a/arm9/overlays/16/asm/overlay_16.s b/arm9/overlays/16/asm/overlay_16.s index 9b58c9dbf..da145213a 100644 --- a/arm9/overlays/16/asm/overlay_16.s +++ b/arm9/overlays/16/asm/overlay_16.s @@ -16,7 +16,7 @@ ov16_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x25 lsl r2, r2, #0x12 - bl CreateHeap + bl Heap_Create add r0, r5, #0 mov r1, #4 mov r2, #0x25 @@ -168,7 +168,7 @@ _021D7630: add r0, r4, #0 bl OverlayManager_FreeData mov r0, #0x25 - bl DestroyHeap + bl Heap_Destroy mov r0, #1 mov r1, #0x7f bl GF_SndPlayerSetPlayerVolume @@ -242,7 +242,7 @@ ov16_021D76AC: ; 0x021D76AC add r5, r1, #0 ldr r1, _021D77D0 ; =0x00001D10 add r7, r0, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021D76C2 bl GF_AssertFail @@ -1824,7 +1824,7 @@ ov16_021D8298: ; 0x021D8298 _021D82B0: ldr r0, _021D83D8 ; =0x00001A0C ldr r0, [r6, r0] - bl FreeToHeap + bl Heap_Free ldr r0, _021D83DC ; =0x00001A10 ldr r0, [r6, r0] cmp r0, #0 @@ -1833,7 +1833,7 @@ _021D82B0: _021D82C4: ldr r0, _021D83DC ; =0x00001A10 ldr r0, [r6, r0] - bl FreeToHeap + bl Heap_Free ldr r0, _021D83E0 ; =0x00001A14 ldr r0, [r6, r0] cmp r0, #0 @@ -1842,7 +1842,7 @@ _021D82C4: _021D82D8: ldr r0, _021D83E0 ; =0x00001A14 ldr r0, [r6, r0] - bl FreeToHeap + bl Heap_Free ldr r0, _021D83E4 ; =0x00001A18 ldr r0, [r6, r0] cmp r0, #0 @@ -1851,7 +1851,7 @@ _021D82D8: _021D82EC: ldr r0, _021D83E4 ; =0x00001A18 ldr r0, [r6, r0] - bl FreeToHeap + bl Heap_Free mov r0, #0x1d lsl r0, r0, #8 ldr r0, [r6, r0] @@ -1862,7 +1862,7 @@ _021D8302: mov r0, #0x1d lsl r0, r0, #8 ldr r0, [r6, r0] - bl FreeToHeap + bl Heap_Free ldr r0, _021D83E8 ; =0x00001D04 ldr r0, [r6, r0] cmp r0, #0 @@ -1871,7 +1871,7 @@ _021D8302: _021D8318: ldr r0, _021D83E8 ; =0x00001D04 ldr r0, [r6, r0] - bl FreeToHeap + bl Heap_Free ldr r0, _021D83EC ; =0x00001D08 ldr r0, [r6, r0] cmp r0, #0 @@ -1880,7 +1880,7 @@ _021D8318: _021D832C: ldr r0, _021D83EC ; =0x00001D08 ldr r0, [r6, r0] - bl FreeToHeap + bl Heap_Free ldr r0, _021D83F0 ; =0x00001D0C ldr r0, [r6, r0] cmp r0, #0 @@ -1889,7 +1889,7 @@ _021D832C: _021D8340: ldr r0, _021D83F0 ; =0x00001D0C ldr r0, [r6, r0] - bl FreeToHeap + bl Heap_Free ldr r0, _021D83F4 ; =0x00001A30 ldr r4, _021D83F8 ; =0x021FF440 mov r7, #0 @@ -1954,7 +1954,7 @@ _021D83BA: add r0, r6, r0 bl ov16_021D8628 add r0, r6, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, r6, r7, pc} nop _021D83D4: .word 0x00001A1C @@ -2264,7 +2264,7 @@ ov16_021D8628: ; 0x021D8628 ldr r0, [r4] bl ov16_021D8F2C ldr r0, [r4] - bl FreeToHeap + bl Heap_Free mov r0, #0x4f lsl r0, r0, #2 ldr r0, [r4, r0] @@ -3154,14 +3154,14 @@ ov16_021D8C78: ; 0x021D8C78 ldr r1, [r4] add r0, r6, #0 lsr r1, r1, #8 - bl AllocFromHeap + bl Heap_Alloc add r5, r0, #0 beq _021D8CAE add r0, r4, #0 add r1, r5, #0 bl MI_UncompressLZ8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _021D8CAE: add r4, r5, #0 _021D8CB0: @@ -3201,7 +3201,7 @@ _021D8CDC: bl BG_LoadCharTilesData _021D8CF0: add r0, r7, #0 - bl FreeToHeap + bl Heap_Free _021D8CF6: add r0, r4, #0 add sp, #8 @@ -3242,7 +3242,7 @@ _021D8D22: blx r3 _021D8D3C: add r0, r7, #0 - bl FreeToHeap + bl Heap_Free _021D8D42: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -3262,7 +3262,7 @@ ov16_021D8D48: ; 0x021D8D48 cmp r0, #0 bne _021D8D6A add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #0 pop {r3, r4, r5, pc} _021D8D6A: @@ -3284,7 +3284,7 @@ ov16_021D8D70: ; 0x021D8D70 cmp r0, #0 bne _021D8D92 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #0 pop {r3, r4, r5, pc} _021D8D92: @@ -3306,7 +3306,7 @@ ov16_021D8D98: ; 0x021D8D98 cmp r0, #0 bne _021D8DBA add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #0 pop {r3, r4, r5, pc} _021D8DBA: @@ -5009,7 +5009,7 @@ ov16_021D9A90: ; 0x021D9A90 add r0, r7, #0 str r2, [sp, #0x10] str r3, [sp, #0x14] - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r6, r0, #0 bne _021D9AAE bl GF_AssertFail @@ -5022,7 +5022,7 @@ _021D9AAE: str r0, [sp, #0x24] ldr r1, _021D9CA8 ; =0x000003DA add r0, r7, #0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0 bne _021D9ACC bl GF_AssertFail @@ -5241,11 +5241,11 @@ _021D9C82: add r2, r5, r2 bl ov16_021DA5C4 add r0, r6, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [sp, #0x18] - bl FreeToHeap + bl Heap_Free add r0, r7, #0 add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} @@ -6112,7 +6112,7 @@ _021DA226: ldr r3, [sp, #0x18] bl ov16_021DA004 add r0, r6, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x1c pop {r4, r5, r6, r7, pc} _021DA24E: @@ -6231,7 +6231,7 @@ _021DA30A: add r1, r6, #0 bl ov16_021DA004 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} _021DA332: @@ -6406,7 +6406,7 @@ _021DA45E: add r1, r6, #0 bl ov16_021DA004 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} _021DA486: @@ -6560,7 +6560,7 @@ _021DA588: add r1, r6, #0 bl ov16_021DA004 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} _021DA5B0: @@ -6615,7 +6615,7 @@ ov16_021DA5FC: ; 0x021DA5FC push {r3, r4, r5, lr} mov r1, #0x48 add r5, r0, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021DA60E bl GF_AssertFail @@ -6967,7 +6967,7 @@ _021DA84C: ov16_021DA858: ; 0x021DA858 push {r4, lr} mov r1, #0xc - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021DA868 bl GF_AssertFail @@ -7560,7 +7560,7 @@ ov16_021DAC7C: ; 0x021DAC7C bl GF_AssertFail _021DAC8A: ldr r0, [r4, #0x10] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #0x10] pop {r4, pc} @@ -7576,7 +7576,7 @@ ov16_021DAC98: ; 0x021DAC98 str r1, [r6, #4] mov r1, #0x30 add r5, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021DACB2 bl GF_AssertFail @@ -7635,7 +7635,7 @@ ov16_021DAD20: ; 0x021DAD20 str r1, [r5, #4] mov r1, #0x14 add r6, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021DAD3A bl GF_AssertFail @@ -7678,7 +7678,7 @@ ov16_021DAD78: ; 0x021DAD78 str r1, [r6, #4] mov r1, #0x30 add r5, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021DAD92 bl GF_AssertFail @@ -7742,7 +7742,7 @@ ov16_021DAE0C: ; 0x021DAE0C str r1, [r6, #4] mov r1, #0x30 add r5, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021DAE26 bl GF_AssertFail @@ -7802,7 +7802,7 @@ ov16_021DAE94: ; 0x021DAE94 str r0, [r5, #4] add r0, r2, #0 mov r1, #0xc - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021DAEB0 bl GF_AssertFail @@ -7832,7 +7832,7 @@ ov16_021DAED4: ; 0x021DAED4 str r1, [r5, #4] mov r1, #0x18 add r6, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021DAEEE bl GF_AssertFail @@ -7880,7 +7880,7 @@ ov16_021DAF38: ; 0x021DAF38 str r1, [r5, #4] mov r1, #0x18 add r6, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021DAF52 bl GF_AssertFail @@ -7928,7 +7928,7 @@ ov16_021DAF9C: ; 0x021DAF9C str r1, [r5, #4] mov r1, #0x18 add r6, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021DAFB6 bl GF_AssertFail @@ -7976,7 +7976,7 @@ ov16_021DB000: ; 0x021DB000 str r1, [r5, #4] mov r1, #0xc add r6, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021DB01A bl GF_AssertFail @@ -8019,7 +8019,7 @@ ov16_021DB058: ; 0x021DB058 str r1, [r5, #4] mov r1, #0xc add r6, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021DB072 bl GF_AssertFail @@ -8062,7 +8062,7 @@ ov16_021DB0B0: ; 0x021DB0B0 str r1, [r5, #4] mov r1, #0x18 add r6, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021DB0CA bl GF_AssertFail @@ -8110,7 +8110,7 @@ ov16_021DB114: ; 0x021DB114 str r1, [r5, #4] mov r1, #0xc add r6, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021DB12E bl GF_AssertFail @@ -8153,7 +8153,7 @@ ov16_021DB16C: ; 0x021DB16C str r1, [r5, #4] mov r1, #0x18 add r6, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021DB186 bl GF_AssertFail @@ -8201,7 +8201,7 @@ ov16_021DB1D0: ; 0x021DB1D0 str r1, [r5, #4] mov r1, #0xc add r6, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021DB1EA bl GF_AssertFail @@ -8241,7 +8241,7 @@ ov16_021DB228: ; 0x021DB228 add r5, r0, #0 ldr r0, [r5, #0xc] mov r1, #0x18 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021DB23C bl GF_AssertFail @@ -8261,7 +8261,7 @@ _021DB242: ldr r1, [r5, #8] ldr r0, [r5, #0xc] lsl r1, r1, #4 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #0xc] cmp r0, #0 bne _021DB268 @@ -8294,7 +8294,7 @@ _021DB292: add r0, r4, #0 bl ov16_021DB358 ldr r0, [r4, #0xc] - bl FreeToHeap + bl Heap_Free ldr r0, [r4] bl sub_020117BC add r2, r4, #0 @@ -8306,7 +8306,7 @@ _021DB2AA: sub r1, r1, #1 bne _021DB2AA add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021DB288 @@ -8576,7 +8576,7 @@ _021DB48C: ov16_021DB490: ; 0x021DB490 push {r3, lr} mov r1, #0x14 - bl AllocFromHeap + bl Heap_Alloc add r3, r0, #0 mov r2, #0x14 mov r1, #0 @@ -8590,10 +8590,10 @@ _021DB49E: thumb_func_start ov16_021DB4A8 ov16_021DB4A8: ; 0x021DB4A8 - ldr r3, _021DB4AC ; =FreeToHeap + ldr r3, _021DB4AC ; =Heap_Free bx r3 .align 2, 0 -_021DB4AC: .word FreeToHeap +_021DB4AC: .word Heap_Free thumb_func_end ov16_021DB4A8 thumb_func_start ov16_021DB4B0 @@ -9980,7 +9980,7 @@ _021DBDCA: bl GF_AssertFail _021DBDD4: ldr r0, [r4] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4] str r0, [r4, #4] @@ -10439,7 +10439,7 @@ ov16_021DC10C: ; 0x021DC10C push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0x38 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021DC11E bl GF_AssertFail @@ -10472,7 +10472,7 @@ ov16_021DC148: ; 0x021DC148 bl GF_AssertFail _021DC152: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021DC148 @@ -10482,7 +10482,7 @@ ov16_021DC15C: ; 0x021DC15C push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #4 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021DC16E bl GF_AssertFail @@ -10507,7 +10507,7 @@ ov16_021DC184: ; 0x021DC184 bl GF_AssertFail _021DC18E: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021DC184 @@ -10522,7 +10522,7 @@ ov16_021DC198: ; 0x021DC198 mov r1, #0x14 add r0, r5, #0 mul r1, r2 - bl AllocFromHeap + bl Heap_Alloc add r6, r0, #0 add r0, r5, #0 add r1, r6, #0 @@ -10579,7 +10579,7 @@ _021DC202: add r0, #0x50 bl ov16_021DAC7C add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov16_021DC1F8 @@ -10596,7 +10596,7 @@ ov16_021DC234: ; 0x021DC234 ldr r0, [r5, #4] add r4, r1, #0 mov r1, #0x24 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #8] cmp r0, #0 bne _021DC24C @@ -10662,7 +10662,7 @@ ov16_021DC2B0: ; 0x021DC2B0 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #8] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #8] mov r0, #1 @@ -10695,7 +10695,7 @@ _021DC2E8: mov r1, #0x52 ldr r0, [r4, #4] lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc add r7, r0, #0 bne _021DC2FA bl GF_AssertFail @@ -10924,7 +10924,7 @@ _021DC4AC: add r0, r6, #0 bl ov16_021DC754 add r0, r6, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -11326,7 +11326,7 @@ ov16_021DC770: ; 0x021DC770 str r0, [sp, #8] bl GX_LoadBGPltt ldr r0, [sp, #0xc] - bl FreeToHeap + bl Heap_Free add r0, r7, #0 add r1, r6, #0 bl ov16_021DC860 @@ -11431,7 +11431,7 @@ ov16_021DC860: ; 0x021DC860 ldr r0, [r5] bl LoadRectToBgTilemapRect add r0, r6, #0 - bl FreeToHeap + bl Heap_Free str r4, [sp] add r0, r5, #0 mov r1, #0x27 @@ -11456,7 +11456,7 @@ ov16_021DC860: ; 0x021DC860 ldr r0, [r5] bl LoadRectToBgTilemapRect add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r5] mov r1, #3 bl ScheduleBgTilemapBufferTransfer @@ -11508,7 +11508,7 @@ ov16_021DC93C: ; 0x021DC93C add r4, r0, #0 add r0, #0xd8 ldr r0, [r0] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 mov r1, #0 add r0, #0xd8 @@ -14016,7 +14016,7 @@ ov16_021DDCA4: ; 0x021DDCA4 add r6, r1, #0 mov r1, #0x28 add r5, r0, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021DDCB8 bl GF_AssertFail @@ -14052,7 +14052,7 @@ ov16_021DDCEC: ; 0x021DDCEC push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #4 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021DDCFE bl GF_AssertFail @@ -14080,7 +14080,7 @@ ov16_021DDD14: ; 0x021DDD14 mul r7, r1 add r0, r5, #0 add r1, r7, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021DDD34 bl GF_AssertFail @@ -14107,7 +14107,7 @@ ov16_021DDD50: ; 0x021DDD50 bl GF_AssertFail _021DDD5A: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021DDD50 @@ -14120,7 +14120,7 @@ ov16_021DDD64: ; 0x021DDD64 bl GF_AssertFail _021DDD6E: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021DDD64 @@ -14135,7 +14135,7 @@ _021DDD82: add r0, r4, #0 bl ov16_021DAC7C add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov16_021DDD78 @@ -14152,7 +14152,7 @@ ov16_021DDD94: ; 0x021DDD94 ldr r0, [r5, #4] add r4, r1, #0 mov r1, #0x24 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #8] cmp r0, #0 bne _021DDDAC @@ -14233,7 +14233,7 @@ ov16_021DDE28: ; 0x021DDE28 ldr r0, [r4, #8] bl ov16_021DE0EC ldr r0, [r4, #8] - bl FreeToHeap + bl Heap_Free mov r0, #1 pop {r4, pc} thumb_func_end ov16_021DDE28 @@ -14262,7 +14262,7 @@ _021DDE56: ; jump table _021DDE60: ldr r0, [r4, #4] mov r1, #0x3c - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #8] cmp r0, #0 bne _021DDE72 @@ -14438,7 +14438,7 @@ _021DDFB2: str r0, [r4] b _021DDFD8 _021DDFC2: - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #8] ldr r0, [r4] @@ -14465,7 +14465,7 @@ ov16_021DDFE0: ; 0x021DDFE0 add r4, r1, #0 add r0, r6, #0 mov r1, #0x1c - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #8] mov r0, #0x60 str r0, [sp] @@ -14527,7 +14527,7 @@ ov16_021DDFE0: ; 0x021DDFE0 bl ov16_021D7C98 add r0, r6, #0 mov r1, #8 - bl AllocFromHeap + bl Heap_Alloc add r3, r0, #0 str r5, [r3] str r4, [r3, #4] @@ -14593,9 +14593,9 @@ ov16_021DE0EC: ; 0x021DE0EC ldr r0, [r4] bl sub_0202212C ldr r0, [r4, #4] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #8] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #8] pop {r4, pc} @@ -14856,7 +14856,7 @@ _021DE2AC: add r0, r6, #0 bl LoadRectToBgTilemapRect add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r6, #0 mov r1, #6 bl ScheduleBgTilemapBufferTransfer @@ -15440,7 +15440,7 @@ ov16_021DE788: ; 0x021DE788 add r0, r4, #0 bl LoadRectToBgTilemapRect add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 mov r1, #7 bl ScheduleBgTilemapBufferTransfer @@ -16133,7 +16133,7 @@ ov16_021DEC64: ; 0x021DEC64 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0x38 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021DEC76 bl GF_AssertFail @@ -16162,7 +16162,7 @@ ov16_021DECA0: ; 0x021DECA0 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #4 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021DECB2 bl GF_AssertFail @@ -16190,7 +16190,7 @@ ov16_021DECC8: ; 0x021DECC8 mul r7, r1 add r0, r5, #0 add r1, r7, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021DECE8 bl GF_AssertFail @@ -16217,7 +16217,7 @@ ov16_021DED04: ; 0x021DED04 bl GF_AssertFail _021DED0E: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021DED04 @@ -16230,7 +16230,7 @@ ov16_021DED18: ; 0x021DED18 bl GF_AssertFail _021DED22: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021DED18 @@ -16245,7 +16245,7 @@ _021DED36: add r0, r4, #0 bl ov16_021DAC7C add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov16_021DED2C @@ -16262,7 +16262,7 @@ ov16_021DED48: ; 0x021DED48 ldr r0, [r5, #4] add r4, r1, #0 mov r1, #4 - bl AllocFromHeap + bl Heap_Alloc add r6, r0, #0 bne _021DED5E bl GF_AssertFail @@ -16449,7 +16449,7 @@ ov16_021DEEA4: ; 0x021DEEA4 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #8] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #8] mov r0, #1 @@ -16481,7 +16481,7 @@ _021DEED4: ; jump table _021DEEDC: ldr r0, [r4, #4] mov r1, #0x64 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #8] mov r1, #0 mov r2, #0x64 @@ -16618,7 +16618,7 @@ _021DEFCE: str r0, [r4] b _021DEFF2 _021DEFDC: - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #8] ldr r0, [r4] @@ -16812,7 +16812,7 @@ ov16_021DF168: ; 0x021DF168 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x5c] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #0x5c] str r0, [r4, #0x60] @@ -17306,7 +17306,7 @@ ov16_021DF514: ; 0x021DF514 ldr r0, [r0] bl LoadRectToBgTilemapRect ldr r0, [sp, #0x10] - bl FreeToHeap + bl Heap_Free cmp r7, #3 bhi _021DF584 add r0, r7, r7 @@ -17363,7 +17363,7 @@ _021DF584: ldr r0, [r0] bl LoadRectToBgTilemapRect add r0, r6, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4] mov r1, #3 ldr r0, [r0] @@ -18020,7 +18020,7 @@ ov16_021DFAA0: ; 0x021DFAA0 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021DFAB2 bl GF_AssertFail @@ -18056,7 +18056,7 @@ ov16_021DFAE8: ; 0x021DFAE8 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0xc - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021DFAFA bl GF_AssertFail @@ -18095,7 +18095,7 @@ ov16_021DFB24: ; 0x021DFB24 bl GF_AssertFail _021DFB2E: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021DFB24 @@ -18108,7 +18108,7 @@ ov16_021DFB38: ; 0x021DFB38 bl GF_AssertFail _021DFB42: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021DFB38 @@ -18132,7 +18132,7 @@ ov16_021DFB54: ; 0x021DFB54 ldr r0, [r5, #4] add r6, r1, #0 mov r1, #0x9c - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021DFB6A bl GF_AssertFail @@ -18342,7 +18342,7 @@ ov16_021DFCEC: ; 0x021DFCEC add r0, r5, #0 bl ov16_021E18D0 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #8] mov r0, #1 @@ -18375,7 +18375,7 @@ _021DFD32: mov r1, #0x4e ldr r0, [r4, #4] lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x4e str r0, [r4, #8] mov r1, #0 @@ -18652,7 +18652,7 @@ _021DFF4E: b _021DFF6E _021DFF56: add r0, r5, #0 - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #8] ldr r0, [r4] @@ -18763,7 +18763,7 @@ ov16_021DFFE0: ; 0x021DFFE0 ldr r0, [r0] bl LoadRectToBgTilemapRect add r0, r5, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4] mov r1, #6 ldr r0, [r0] @@ -18943,7 +18943,7 @@ ov16_021E0158: ; 0x021E0158 add r4, r1, #0 add r0, r6, #0 mov r1, #0x18 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #4] mov r0, #1 lsl r0, r0, #8 @@ -19091,7 +19091,7 @@ ov16_021E026C: ; 0x021E026C ldr r0, [r4] bl sub_0202212C ldr r0, [r4, #4] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #4] pop {r4, pc} @@ -19130,7 +19130,7 @@ ov16_021E02AC: ; 0x021E02AC ldr r0, [r4, #8] bl sub_0202212C ldr r0, [r4, #0xc] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #0xc] pop {r4, pc} @@ -19159,7 +19159,7 @@ ov16_021E02D4: ; 0x021E02D4 add r0, r2, #0 mov r1, #0x18 str r2, [sp, #0xc] - bl AllocFromHeap + bl Heap_Alloc ldr r1, [sp, #4] str r0, [r1, #0xc] mov r0, #0 @@ -19327,7 +19327,7 @@ ov16_021E0400: ; 0x021E0400 add r0, r2, #0 mov r1, #0x28 str r2, [sp, #0xc] - bl AllocFromHeap + bl Heap_Alloc ldr r1, [sp, #4] str r0, [r1, #0xc] mov r0, #0 @@ -19520,7 +19520,7 @@ ov16_021E0558: ; 0x021E0558 add r0, r2, #0 mov r1, #0x2c str r2, [sp, #0xc] - bl AllocFromHeap + bl Heap_Alloc ldr r1, [sp, #4] str r0, [r1, #0xc] mov r0, #0 @@ -19750,7 +19750,7 @@ ov16_021E06F8: ; 0x021E06F8 add r0, r2, #0 mov r1, #0x28 str r2, [sp, #0xc] - bl AllocFromHeap + bl Heap_Alloc ldr r1, [sp, #4] str r0, [r1, #0xc] mov r0, #0 @@ -19982,7 +19982,7 @@ ov16_021E08A0: ; 0x021E08A0 add r0, r2, #0 mov r1, #0x3c str r2, [sp, #0xc] - bl AllocFromHeap + bl Heap_Alloc ldr r1, [sp, #4] str r0, [r1, #0xc] mov r0, #0 @@ -20429,7 +20429,7 @@ ov16_021E0BB8: ; 0x021E0BB8 add r0, r1, #0 mov r1, #0x7e lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc ldr r1, [sp, #0x10] str r0, [r1, #0x1c] mov r0, #0 @@ -20693,7 +20693,7 @@ ov16_021E0D90: ; 0x021E0D90 add r0, r1, #0 mov r1, #0x7e lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc ldr r1, [sp, #0x10] str r0, [r1, #0x1c] mov r0, #0 @@ -21023,7 +21023,7 @@ ov16_021E0FDC: ; 0x021E0FDC add r0, r1, #0 mov r1, #0x7e lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc ldr r1, [sp, #0x10] str r0, [r1, #0x1c] mov r0, #0 @@ -21397,7 +21397,7 @@ ov16_021E127C: ; 0x021E127C add r0, r1, #0 mov r1, #0x7e lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc ldr r1, [sp, #0x10] str r0, [r1, #0x1c] mov r0, #0 @@ -21785,7 +21785,7 @@ ov16_021E1534: ; 0x021E1534 add r0, r1, #0 mov r1, #0x2a lsl r1, r1, #4 - bl AllocFromHeap + bl Heap_Alloc ldr r1, [sp, #0x10] str r0, [r1, #0x1c] mov r0, #0 @@ -22291,7 +22291,7 @@ ov16_021E18D0: ; 0x021E18D0 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x1c] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x18] bl ov16_021DB4A8 mov r0, #0 @@ -25402,7 +25402,7 @@ ov16_021E2F64: ; 0x021E2F64 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0xc - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021E2F76 bl GF_AssertFail @@ -25437,7 +25437,7 @@ ov16_021E2FA8: ; 0x021E2FA8 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0x14 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021E2FBA bl GF_AssertFail @@ -25465,7 +25465,7 @@ ov16_021E2FD4: ; 0x021E2FD4 bl GF_AssertFail _021E2FDE: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021E2FD4 @@ -25478,7 +25478,7 @@ ov16_021E2FE8: ; 0x021E2FE8 bl GF_AssertFail _021E2FF2: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021E2FE8 @@ -25496,7 +25496,7 @@ ov16_021E3000: ; 0x021E3000 ldr r0, [r6, #4] add r5, r1, #0 mov r1, #0x34 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021E3016 bl GF_AssertFail @@ -25592,17 +25592,17 @@ ov16_021E30B0: ; 0x021E30B0 ldr r0, [r5, #4] cmp r0, #0 beq _021E30C0 - bl FreeToHeap + bl Heap_Free _021E30C0: ldr r0, [r5, #8] cmp r0, #0 beq _021E30CA - bl FreeToHeap + bl Heap_Free _021E30CA: add r0, r5, #0 bl ov16_021E4070 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #8] mov r0, #1 @@ -25637,7 +25637,7 @@ _021E3102: ; jump table _021E310A: ldr r0, [r4, #4] ldr r1, _021E31D4 ; =0x00000844 - bl AllocFromHeap + bl Heap_Alloc ldr r2, _021E31D4 ; =0x00000844 str r0, [r4, #8] mov r1, #0 @@ -25842,12 +25842,12 @@ _021E329E: bl GfGfx_EngineATogglePlanes ldr r0, _021E32D0 ; =0x00000804 ldr r0, [r5, r0] - bl FreeToHeap + bl Heap_Free ldr r0, _021E32D4 ; =0x00000808 ldr r0, [r5, r0] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #8] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #8] ldr r0, [r4] @@ -25960,7 +25960,7 @@ ov16_021E3348: ; 0x021E3348 ldr r0, [r0] bl LoadRectToBgTilemapRect add r0, r7, #0 - bl FreeToHeap + bl Heap_Free ldr r1, [r6] ldr r0, _021E34C0 ; =0x00001764 ldr r0, [r1, r0] @@ -25991,7 +25991,7 @@ ov16_021E3348: ; 0x021E3348 ldr r0, [r0] bl LoadRectToBgTilemapRect add r0, r7, #0 - bl FreeToHeap + bl Heap_Free _021E33E6: ldr r1, [r6] ldr r0, _021E34C4 ; =0x0000176C @@ -26023,7 +26023,7 @@ _021E33E6: ldr r0, [r0] bl LoadRectToBgTilemapRect add r0, r7, #0 - bl FreeToHeap + bl Heap_Free _021E342A: ldr r1, [r6] ldr r0, _021E34C8 ; =0x00001760 @@ -26055,7 +26055,7 @@ _021E342A: ldr r0, [r0] bl LoadRectToBgTilemapRect add r0, r7, #0 - bl FreeToHeap + bl Heap_Free _021E346E: ldr r1, [r6] ldr r0, _021E34CC ; =0x00001768 @@ -26087,7 +26087,7 @@ _021E346E: ldr r0, [r0] bl LoadRectToBgTilemapRect add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _021E34B2: ldr r0, [r5] mov r1, #3 @@ -26992,7 +26992,7 @@ ov16_021E3BC8: ; 0x021E3BC8 bl BgClearTilemapBufferAndCommit ldr r0, _021E3C10 ; =0x000007F4 ldr r0, [r5, r0] - bl FreeToHeap + bl Heap_Free ldr r1, _021E3C10 ; =0x000007F4 mov r2, #0 str r2, [r5, r1] @@ -27000,7 +27000,7 @@ ov16_021E3BC8: ; 0x021E3BC8 add r1, #8 str r2, [r5, r0] ldr r0, [r5, r1] - bl FreeToHeap + bl Heap_Free ldr r0, _021E3C14 ; =0x000007FC mov r1, #0 str r1, [r5, r0] @@ -27046,7 +27046,7 @@ ov16_021E3C18: ; 0x021E3C18 add r7, r1, r0 ldr r0, [sp, #0x2c] add r1, r7, #0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r5, r0, #0 mov r1, #0 cmp r7, #0 @@ -27086,7 +27086,7 @@ _021E3C7E: lsl r1, r1, #6 str r0, [r6, r1] add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r6, #0 mov r1, #0x1e add r0, #0xec @@ -27162,7 +27162,7 @@ _021E3CEC: add r7, r1, r0 ldr r0, [sp, #0x2c] add r1, r7, #0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r5, r0, #0 mov r1, #0 cmp r7, #0 @@ -27214,7 +27214,7 @@ _021E3D68: add r6, #0xc4 str r0, [r6] add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x3c pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -27296,7 +27296,7 @@ _021E3E30: cmp r4, #0 beq _021E3E3C add r1, r4, #0 - bl AllocFromHeap + bl Heap_Alloc b _021E3E3E _021E3E3C: mov r0, #0 @@ -27891,7 +27891,7 @@ ov16_021E42AC: ; 0x021E42AC push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #8 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021E42BE bl GF_AssertFail @@ -27922,7 +27922,7 @@ ov16_021E42E8: ; 0x021E42E8 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #4 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021E42FA bl GF_AssertFail @@ -27953,7 +27953,7 @@ ov16_021E4314: ; 0x021E4314 bl GF_AssertFail _021E431E: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021E4314 @@ -27966,7 +27966,7 @@ ov16_021E4328: ; 0x021E4328 bl GF_AssertFail _021E4332: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021E4328 @@ -27990,7 +27990,7 @@ ov16_021E4344: ; 0x021E4344 ldr r0, [r5, #4] add r6, r1, #0 mov r1, #0x28 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021E435A bl GF_AssertFail @@ -28047,7 +28047,7 @@ ov16_021E43AC: ; 0x021E43AC add r0, r4, #0 bl ov16_021E4968 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #1 pop {r4, pc} thumb_func_end ov16_021E43AC @@ -28078,7 +28078,7 @@ _021E43E0: ; jump table _021E43E8: ldr r0, [r4, #4] mov r1, #0x2c - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #8] mov r1, #0 mov r2, #0x2c @@ -28231,9 +28231,9 @@ _021E450A: b _021E4534 _021E451C: ldr r0, [r5, #0x14] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #8] - bl FreeToHeap + bl Heap_Free ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -28430,7 +28430,7 @@ ov16_021E4634: ; 0x021E4634 ldr r0, [r0] bl LoadRectToBgTilemapRect add r0, r5, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4] mov r1, #6 ldr r0, [r0] @@ -28612,7 +28612,7 @@ ov16_021E47E4: ; 0x021E47E4 add r4, r1, #0 add r0, r6, #0 mov r1, #4 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x14] mov r1, #0xfe strb r1, [r0] @@ -28818,7 +28818,7 @@ ov16_021E4968: ; 0x021E4968 ldr r0, [r4, #0x10] bl sub_0202212C ldr r0, [r4, #0x14] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #0x14] pop {r4, pc} @@ -28894,7 +28894,7 @@ _021E49F8: ldr r0, [r5, #0x14] cmp r0, #0 beq _021E4A04 - bl FreeToHeap + bl Heap_Free _021E4A04: ldr r1, [r5, #0x18] add r2, r5, #0 @@ -28922,7 +28922,7 @@ _021E4A2E: ldr r0, [r5, #0x14] cmp r0, #0 beq _021E4A38 - bl FreeToHeap + bl Heap_Free _021E4A38: ldr r1, [r5, #0x1c] add r2, r5, #0 @@ -29154,7 +29154,7 @@ ov16_021E4BCC: ; 0x021E4BCC push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0x20 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021E4BDE bl GF_AssertFail @@ -29183,7 +29183,7 @@ ov16_021E4C08: ; 0x021E4C08 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #4 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021E4C1A bl GF_AssertFail @@ -29208,7 +29208,7 @@ ov16_021E4C30: ; 0x021E4C30 bl GF_AssertFail _021E4C3A: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021E4C30 @@ -29221,7 +29221,7 @@ ov16_021E4C44: ; 0x021E4C44 bl GF_AssertFail _021E4C4E: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021E4C44 @@ -29329,7 +29329,7 @@ _021E4CF8: ; jump table _021E4D00: ldr r0, [r4, #4] mov r1, #0x74 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #8] mov r1, #0 mov r2, #0x74 @@ -29522,7 +29522,7 @@ _021E4E58: str r0, [r4] b _021E4E76 _021E4E66: - bl FreeToHeap + bl Heap_Free ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -29651,7 +29651,7 @@ ov16_021E4F1C: ; 0x021E4F1C ldr r0, [r0] bl LoadRectToBgTilemapRect add r0, r6, #0 - bl FreeToHeap + bl Heap_Free str r4, [sp] ldr r0, [r5] mov r1, #0x33 @@ -29676,7 +29676,7 @@ ov16_021E4F1C: ; 0x021E4F1C ldr r0, [r0] bl LoadRectToBgTilemapRect add r0, r6, #0 - bl FreeToHeap + bl Heap_Free str r4, [sp] ldr r0, [r5] mov r1, #0x34 @@ -29702,7 +29702,7 @@ ov16_021E4F1C: ; 0x021E4F1C ldr r0, [r0] bl LoadRectToBgTilemapRect add r0, r6, #0 - bl FreeToHeap + bl Heap_Free str r4, [sp] ldr r0, [r5] mov r1, #0x36 @@ -29728,7 +29728,7 @@ ov16_021E4F1C: ; 0x021E4F1C ldr r0, [r0] bl LoadRectToBgTilemapRect add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r5] mov r1, #3 ldr r0, [r0] @@ -31364,7 +31364,7 @@ ov16_021E5C88: ; 0x021E5C88 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0x18 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021E5C9A bl GF_AssertFail @@ -31397,7 +31397,7 @@ ov16_021E5CC8: ; 0x021E5CC8 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0xc - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021E5CDA bl GF_AssertFail @@ -31430,7 +31430,7 @@ ov16_021E5D00: ; 0x021E5D00 bl GF_AssertFail _021E5D0A: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021E5D00 @@ -31443,7 +31443,7 @@ ov16_021E5D14: ; 0x021E5D14 bl GF_AssertFail _021E5D1E: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021E5D14 @@ -31536,7 +31536,7 @@ _021E5D9C: ; jump table _021E5DA4: ldr r0, [r4, #4] mov r1, #0xd0 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #8] mov r1, #0 mov r2, #0xd0 @@ -31734,7 +31734,7 @@ _021E5F1C: str r0, [r4] b _021E5F3A _021E5F2A: - bl FreeToHeap + bl Heap_Free ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -31839,7 +31839,7 @@ ov16_021E5FA4: ; 0x021E5FA4 ldr r0, [r0] bl LoadRectToBgTilemapRect add r0, r5, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4] mov r1, #3 ldr r0, [r0] @@ -33930,7 +33930,7 @@ ov16_021E6F18: ; 0x021E6F18 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0x20 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021E6F2A bl GF_AssertFail @@ -33959,7 +33959,7 @@ ov16_021E6F54: ; 0x021E6F54 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #4 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021E6F66 bl GF_AssertFail @@ -33984,7 +33984,7 @@ ov16_021E6F7C: ; 0x021E6F7C bl GF_AssertFail _021E6F86: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021E6F7C @@ -33997,7 +33997,7 @@ ov16_021E6F90: ; 0x021E6F90 bl GF_AssertFail _021E6F9A: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021E6F90 @@ -34057,7 +34057,7 @@ _021E6FDC: ; jump table _021E6FE4: ldr r0, [r4, #4] mov r1, #0x58 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #8] mov r1, #0 mov r2, #0x58 @@ -34250,7 +34250,7 @@ _021E713C: str r0, [r4] b _021E715A _021E714A: - bl FreeToHeap + bl Heap_Free ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -34359,7 +34359,7 @@ ov16_021E71D0: ; 0x021E71D0 ldr r0, [r0] bl LoadRectToBgTilemapRect add r0, r6, #0 - bl FreeToHeap + bl Heap_Free str r4, [sp] ldr r0, [r5] mov r1, #0x33 @@ -34384,7 +34384,7 @@ ov16_021E71D0: ; 0x021E71D0 ldr r0, [r0] bl LoadRectToBgTilemapRect add r0, r6, #0 - bl FreeToHeap + bl Heap_Free str r4, [sp] ldr r0, [r5] mov r1, #0x37 @@ -34410,7 +34410,7 @@ ov16_021E71D0: ; 0x021E71D0 ldr r0, [r0] bl LoadRectToBgTilemapRect add r0, r6, #0 - bl FreeToHeap + bl Heap_Free str r4, [sp] ldr r0, [r5] mov r1, #0x38 @@ -34436,7 +34436,7 @@ ov16_021E71D0: ; 0x021E71D0 ldr r0, [r0] bl LoadRectToBgTilemapRect add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r5] mov r1, #3 ldr r0, [r0] @@ -35602,7 +35602,7 @@ ov16_021E7BB0: ; 0x021E7BB0 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0x18 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021E7BC2 bl GF_AssertFail @@ -35648,7 +35648,7 @@ ov16_021E7C10: ; 0x021E7C10 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #4 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021E7C22 bl GF_AssertFail @@ -35676,7 +35676,7 @@ ov16_021E7C38: ; 0x021E7C38 mul r7, r1 add r0, r5, #0 add r1, r7, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021E7C58 bl GF_AssertFail @@ -35715,7 +35715,7 @@ ov16_021E7C90: ; 0x021E7C90 bl GF_AssertFail _021E7C9A: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021E7C90 @@ -35728,7 +35728,7 @@ ov16_021E7CA4: ; 0x021E7CA4 bl GF_AssertFail _021E7CAE: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021E7CA4 @@ -35749,7 +35749,7 @@ _021E7CC2: add r0, #0x28 bl ov16_021DAC7C add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov16_021E7CB8 @@ -35766,7 +35766,7 @@ ov16_021E7CE4: ; 0x021E7CE4 ldr r0, [r5, #4] add r6, r1, #0 mov r1, #0x3c - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x3c add r4, r0, #0 @@ -35836,7 +35836,7 @@ ov16_021E7D68: ; 0x021E7D68 add r0, r4, #0 bl ov16_021E8088 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #1 pop {r4, pc} thumb_func_end ov16_021E7D68 @@ -35866,7 +35866,7 @@ _021E7D9A: ; jump table _021E7DA2: ldr r0, [r4, #4] mov r1, #0xc4 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #8] mov r1, #0 mov r2, #0xc4 @@ -36077,7 +36077,7 @@ _021E7F2A: b _021E7F4E _021E7F3C: add r0, r6, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -36100,7 +36100,7 @@ ov16_021E7F54: ; 0x021E7F54 add r4, r1, #0 add r0, r6, #0 mov r1, #0x20 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #4] mov r0, #0xd0 str r0, [sp] @@ -36260,7 +36260,7 @@ ov16_021E8088: ; 0x021E8088 ldr r0, [r4] bl sub_0202212C ldr r0, [r4, #4] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #4] pop {r4, pc} @@ -36528,7 +36528,7 @@ _021E829E: ldr r0, [r0] cmp r0, #0 beq _021E82AC - bl FreeToHeap + bl Heap_Free _021E82AC: add r4, r4, #1 add r5, r5, #4 @@ -36579,7 +36579,7 @@ ov16_021E82B8: ; 0x021E82B8 ldr r0, [r0] bl LoadRectToBgTilemapRect add r0, r6, #0 - bl FreeToHeap + bl Heap_Free str r4, [sp] ldr r0, [r5] mov r1, #0x3c @@ -36605,7 +36605,7 @@ ov16_021E82B8: ; 0x021E82B8 ldr r0, [r0] bl LoadRectToBgTilemapRect add r0, r6, #0 - bl FreeToHeap + bl Heap_Free str r4, [sp] ldr r0, [r5] mov r1, #0x3f @@ -36631,7 +36631,7 @@ ov16_021E82B8: ; 0x021E82B8 ldr r0, [r0] bl LoadRectToBgTilemapRect add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r5] mov r1, #6 ldr r0, [r0] @@ -37349,7 +37349,7 @@ _021E8926: ldr r0, [r6] cmp r0, #0 beq _021E8934 - bl FreeToHeap + bl Heap_Free _021E8934: ldr r0, [sp, #4] ldr r3, [sp, #0x34] @@ -37803,7 +37803,7 @@ ov16_021E8C70: ; 0x021E8C70 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0x34 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021E8C82 bl GF_AssertFail @@ -37862,7 +37862,7 @@ ov16_021E8CF4: ; 0x021E8CF4 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #4 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021E8D06 bl GF_AssertFail @@ -37890,7 +37890,7 @@ ov16_021E8D1C: ; 0x021E8D1C mul r7, r1 add r0, r5, #0 add r1, r7, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021E8D3C bl GF_AssertFail @@ -37960,7 +37960,7 @@ ov16_021E8DBC: ; 0x021E8DBC bl GF_AssertFail _021E8DC6: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021E8DBC @@ -37973,7 +37973,7 @@ ov16_021E8DD0: ; 0x021E8DD0 bl GF_AssertFail _021E8DDA: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021E8DD0 @@ -38009,7 +38009,7 @@ _021E8DEE: add r0, #0x8c bl ov16_021DAC7C add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov16_021E8DE4 @@ -38090,7 +38090,7 @@ _021E8E96: ; jump table _021E8E9E: ldr r0, [r4, #4] mov r1, #0x28 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #8] mov r1, #0 mov r2, #0x28 @@ -38264,7 +38264,7 @@ _021E8FE4: b _021E900C _021E8FF0: add r0, r1, #0 - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #8] ldr r0, [r4] @@ -38730,7 +38730,7 @@ _021E932E: ldr r0, [r0] bl LoadRectToBgTilemapRect add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r5] mov r1, #2 ldr r0, [r0] @@ -39047,7 +39047,7 @@ ov16_021E95D0: ; 0x021E95D0 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0x34 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021E95E2 bl GF_AssertFail @@ -39076,7 +39076,7 @@ ov16_021E960C: ; 0x021E960C push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #4 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021E961E bl GF_AssertFail @@ -39107,7 +39107,7 @@ ov16_021E9638: ; 0x021E9638 bl GF_AssertFail _021E9642: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021E9638 @@ -39120,7 +39120,7 @@ ov16_021E964C: ; 0x021E964C bl GF_AssertFail _021E9656: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021E964C @@ -39144,7 +39144,7 @@ ov16_021E9668: ; 0x021E9668 ldr r0, [r5, #4] add r4, r1, #0 mov r1, #0x1c - bl AllocFromHeap + bl Heap_Alloc add r6, r0, #0 add r2, r6, #0 mov r1, #0x1c @@ -39250,7 +39250,7 @@ ov16_021E972C: ; 0x021E972C add r0, r5, #0 bl ov16_021EA074 ldr r0, [r4, #8] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #8] mov r0, #1 @@ -39283,7 +39283,7 @@ _021E976A: ; jump table _021E9774: ldr r0, [r4, #4] mov r1, #0x28 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #8] mov r1, #0 mov r2, #0x28 @@ -39420,7 +39420,7 @@ _021E9860: str r0, [r4] b _021E9890 _021E987C: - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #8] ldr r0, [r4] @@ -39444,7 +39444,7 @@ ov16_021E9894: ; 0x021E9894 add r4, r1, #0 add r0, r6, #0 mov r1, #0x18 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #4] mov r0, #0x30 str r0, [sp] @@ -39605,7 +39605,7 @@ ov16_021E99C0: ; 0x021E99C0 ldr r0, [r4] bl sub_0202212C ldr r0, [r4, #4] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #4] pop {r4, pc} @@ -39870,7 +39870,7 @@ _021E9B9E: ldr r0, [r0] bl LoadRectToBgTilemapRect add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r5] mov r1, #5 ldr r0, [r0] @@ -40230,7 +40230,7 @@ ov16_021E9E6C: ; 0x021E9E6C add r4, r1, #0 add r0, r6, #0 mov r1, #0xa8 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x18] mov r0, #0x10 str r0, [sp] @@ -40480,7 +40480,7 @@ ov16_021EA074: ; 0x021EA074 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x18] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x14] bl ov16_021DB4A8 mov r0, #0 @@ -40774,7 +40774,7 @@ ov16_021EA274: ; 0x021EA274 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021EA286 bl GF_AssertFail @@ -40810,7 +40810,7 @@ ov16_021EA2BC: ; 0x021EA2BC push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0x14 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021EA2CE bl GF_AssertFail @@ -40838,7 +40838,7 @@ ov16_021EA2E8: ; 0x021EA2E8 bl GF_AssertFail _021EA2F2: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021EA2E8 @@ -40851,7 +40851,7 @@ ov16_021EA2FC: ; 0x021EA2FC bl GF_AssertFail _021EA306: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021EA2FC @@ -40872,7 +40872,7 @@ ov16_021EA314: ; 0x021EA314 add r7, r0, #0 ldr r0, [r5, #4] mov r1, #0x18 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021EA332 bl GF_AssertFail @@ -40929,7 +40929,7 @@ ov16_021EA388: ; 0x021EA388 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #8] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #8] mov r0, #1 @@ -40963,7 +40963,7 @@ _021EA3C2: mov r1, #0x33 ldr r0, [r4, #4] lsl r1, r1, #4 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x33 str r0, [r4, #8] mov r1, #0 @@ -41127,7 +41127,7 @@ _021EA4F6: str r0, [r4] b _021EA518 _021EA504: - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #8] ldr r0, [r4] @@ -41562,7 +41562,7 @@ ov16_021EA7F0: ; 0x021EA7F0 ldr r0, [r0] bl LoadRectToBgTilemapRect add r0, r5, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4] mov r1, #3 ldr r0, [r0] @@ -42479,7 +42479,7 @@ ov16_021EAF18: ; 0x021EAF18 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021EAF2A bl GF_AssertFail @@ -42512,7 +42512,7 @@ ov16_021EAF58: ; 0x021EAF58 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #4 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021EAF6A bl GF_AssertFail @@ -42543,7 +42543,7 @@ ov16_021EAF84: ; 0x021EAF84 bl GF_AssertFail _021EAF8E: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021EAF84 @@ -42556,7 +42556,7 @@ ov16_021EAF98: ; 0x021EAF98 bl GF_AssertFail _021EAFA2: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021EAF98 @@ -42583,7 +42583,7 @@ ov16_021EAFB4: ; 0x021EAFB4 add r7, r0, #0 ldr r0, [r5, #4] mov r1, #0x70 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x70 add r4, r0, #0 @@ -42675,7 +42675,7 @@ ov16_021EB078: ; 0x021EB078 add r0, r4, #0 bl ov16_021EB3F4 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #1 pop {r4, pc} thumb_func_end ov16_021EB078 @@ -42704,7 +42704,7 @@ _021EB0A8: ; jump table _021EB0B0: ldr r0, [r4, #4] mov r1, #0x74 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #8] mov r1, #0 mov r2, #0x74 @@ -42854,7 +42854,7 @@ _021EB1D0: b _021EB1F4 _021EB1E2: add r0, r5, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -43024,11 +43024,11 @@ ov16_021EB31C: ; 0x021EB31C add r6, r1, #0 add r0, r4, #0 mov r1, #0xc - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #4] add r0, r4, #0 mov r1, #8 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x10] mov r0, #0x6a str r0, [sp] @@ -43130,11 +43130,11 @@ ov16_021EB3F4: ; 0x021EB3F4 ldr r0, [r4, #0x14] bl sub_0202212C ldr r0, [r4, #4] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #4] ldr r0, [r4, #0x10] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #0x10] pop {r4, pc} @@ -43596,7 +43596,7 @@ ov16_021EB724: ; 0x021EB724 ldr r0, [r0] bl LoadRectToBgTilemapRect add r0, r6, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r5] mov r1, #6 ldr r0, [r0] @@ -43636,7 +43636,7 @@ ov16_021EB724: ; 0x021EB724 ldr r0, [r0] bl LoadRectToBgTilemapRect add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r5] mov r1, #7 ldr r0, [r0] @@ -44776,7 +44776,7 @@ ov16_021EC080: ; 0x021EC080 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x68] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #0x68] str r0, [r4, #0x6c] @@ -45060,7 +45060,7 @@ ov16_021EC274: ; 0x021EC274 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0xc - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021EC286 bl GF_AssertFail @@ -45098,7 +45098,7 @@ ov16_021EC2C0: ; 0x021EC2C0 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #4 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021EC2D2 bl GF_AssertFail @@ -45129,7 +45129,7 @@ ov16_021EC2EC: ; 0x021EC2EC bl GF_AssertFail _021EC2F6: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021EC2EC @@ -45142,7 +45142,7 @@ ov16_021EC300: ; 0x021EC300 bl GF_AssertFail _021EC30A: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021EC300 @@ -45165,7 +45165,7 @@ ov16_021EC31C: ; 0x021EC31C add r5, r0, #0 ldr r0, [r5, #4] mov r1, #4 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021EC330 bl GF_AssertFail @@ -45198,7 +45198,7 @@ ov16_021EC350: ; 0x021EC350 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #8] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #8] mov r0, #1 @@ -45231,7 +45231,7 @@ _021EC382: ; jump table _021EC38A: ldr r0, [r4, #4] mov r1, #0x14 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #8] mov r2, #0x14 mov r1, #0 @@ -45332,7 +45332,7 @@ _021EC434: str r0, [r4] b _021EC456 _021EC442: - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #8] ldr r0, [r4] @@ -45564,7 +45564,7 @@ ov16_021EC5A8: ; 0x021EC5A8 ldr r0, [r0] bl LoadRectToBgTilemapRect add r0, r5, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4] mov r1, #3 ldr r0, [r0] @@ -46224,7 +46224,7 @@ ov16_021ECB54: ; 0x021ECB54 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021ECB66 bl GF_AssertFail @@ -46259,7 +46259,7 @@ ov16_021ECB98: ; 0x021ECB98 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #4 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021ECBAA bl GF_AssertFail @@ -46287,7 +46287,7 @@ ov16_021ECBC0: ; 0x021ECBC0 mul r7, r1 add r0, r5, #0 add r1, r7, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021ECBE0 bl GF_AssertFail @@ -46319,7 +46319,7 @@ ov16_021ECC08: ; 0x021ECC08 bl GF_AssertFail _021ECC12: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021ECC08 @@ -46332,7 +46332,7 @@ ov16_021ECC1C: ; 0x021ECC1C bl GF_AssertFail _021ECC26: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021ECC1C @@ -46350,7 +46350,7 @@ _021ECC3A: add r0, #0x14 bl ov16_021DAC7C add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov16_021ECC30 @@ -46367,7 +46367,7 @@ ov16_021ECC54: ; 0x021ECC54 ldr r0, [r5, #4] add r4, r1, #0 mov r1, #0x18 - bl AllocFromHeap + bl Heap_Alloc add r6, r0, #0 add r2, r6, #0 mov r1, #0x18 @@ -46452,7 +46452,7 @@ ov16_021ECCF4: ; 0x021ECCF4 add r0, r4, #0 bl ov16_021ECFD4 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #1 pop {r4, pc} thumb_func_end ov16_021ECCF4 @@ -46481,7 +46481,7 @@ _021ECD24: ; jump table _021ECD2C: ldr r0, [r4, #4] mov r1, #0x40 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #8] mov r1, #0 mov r2, #0x40 @@ -46615,7 +46615,7 @@ _021ECE1E: b _021ECE42 _021ECE30: add r0, r6, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -46774,7 +46774,7 @@ ov16_021ECF40: ; 0x021ECF40 add r4, r1, #0 add r0, r6, #0 mov r1, #8 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #4] mov r0, #0x80 str r0, [sp] @@ -46857,7 +46857,7 @@ ov16_021ECFD4: ; 0x021ECFD4 ldr r0, [r4] bl sub_0202212C ldr r0, [r4, #4] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #4] pop {r4, pc} @@ -46972,7 +46972,7 @@ _021ED0BA: ldr r0, [r5, #0x38] cmp r0, #0 beq _021ED0C4 - bl FreeToHeap + bl Heap_Free _021ED0C4: add r4, r4, #1 add r5, r5, #4 @@ -47023,7 +47023,7 @@ ov16_021ED0D0: ; 0x021ED0D0 ldr r0, [r0] bl LoadRectToBgTilemapRect add r0, r5, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4] mov r1, #6 ldr r0, [r0] @@ -47407,7 +47407,7 @@ _021ED422: ldr r0, [r6] cmp r0, #0 beq _021ED430 - bl FreeToHeap + bl Heap_Free _021ED430: ldr r0, [sp, #4] ldr r3, [sp, #0x34] @@ -47639,7 +47639,7 @@ ov16_021ED5C8: ; 0x021ED5C8 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #8 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021ED5DA bl GF_AssertFail @@ -47671,7 +47671,7 @@ ov16_021ED604: ; 0x021ED604 add r6, r1, #0 mov r1, #0x20 add r5, r0, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021ED618 bl GF_AssertFail @@ -47705,7 +47705,7 @@ ov16_021ED648: ; 0x021ED648 bl GF_AssertFail _021ED652: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021ED648 @@ -47722,7 +47722,7 @@ _021ED666: add r0, r4, #0 bl ov16_021EE14C add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021ED65C @@ -47740,7 +47740,7 @@ ov16_021ED680: ; 0x021ED680 ldr r0, [r6, #4] add r5, r1, #0 mov r1, #8 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021ED696 bl GF_AssertFail @@ -47809,7 +47809,7 @@ ov16_021ED6FC: ; 0x021ED6FC push {r4, lr} add r4, r0, #0 ldr r0, [r4, #8] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #8] mov r0, #1 @@ -47843,7 +47843,7 @@ _021ED730: ; jump table _021ED738: ldr r0, [r4, #4] mov r1, #0xc4 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #8] mov r1, #0 mov r2, #0xc4 @@ -48066,7 +48066,7 @@ _021ED8CA: bl SysTask_Destroy _021ED8DA: ldr r0, [r4, #8] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #8] ldr r0, [r4] @@ -48321,7 +48321,7 @@ ov16_021EDA7C: ; 0x021EDA7C ldr r0, [r0] bl LoadRectToBgTilemapRect add r0, r5, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4] mov r1, #3 ldr r0, [r0] @@ -48402,7 +48402,7 @@ ov16_021EDAE4: ; 0x021EDAE4 _021EDB82: add r0, r4, #0 mov r1, #0x60 - bl AllocFromHeap + bl Heap_Alloc add r1, r5, #0 add r1, #0xbc str r0, [r1] @@ -48467,7 +48467,7 @@ _021EDB82: bl sub_02009D68 add r0, r4, #0 mov r1, #0xa0 - bl AllocFromHeap + bl Heap_Alloc add r1, r5, #0 add r1, #0xc0 str r0, [r1] @@ -48562,10 +48562,10 @@ ov16_021EDC70: ; 0x021EDC70 add r0, r5, #0 add r0, #0xbc ldr r0, [r0] - bl FreeToHeap + bl Heap_Free add r5, #0xc0 ldr r0, [r5] - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end ov16_021EDC70 @@ -49046,9 +49046,9 @@ ov16_021EE0F0: ; 0x021EE0F0 ldr r0, [r4, #8] bl sub_02013E44 ldr r0, [r4, #0x10] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x14] - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021EE0F0 @@ -49834,7 +49834,7 @@ ov16_021EE6CC: ; 0x021EE6CC push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021EE6DE bl GF_AssertFail @@ -49870,7 +49870,7 @@ ov16_021EE714: ; 0x021EE714 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #4 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021EE726 bl GF_AssertFail @@ -49901,7 +49901,7 @@ ov16_021EE740: ; 0x021EE740 bl GF_AssertFail _021EE74A: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021EE740 @@ -49914,7 +49914,7 @@ ov16_021EE754: ; 0x021EE754 bl GF_AssertFail _021EE75E: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021EE754 @@ -49938,7 +49938,7 @@ ov16_021EE770: ; 0x021EE770 ldr r0, [r5, #4] add r6, r1, #0 mov r1, #0x18 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 add r2, r4, #0 mov r1, #0x18 @@ -50021,7 +50021,7 @@ ov16_021EE810: ; 0x021EE810 add r0, r4, #0 bl ov16_021EEAA0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #1 pop {r4, pc} thumb_func_end ov16_021EE810 @@ -50050,7 +50050,7 @@ _021EE840: ; jump table _021EE848: ldr r0, [r4, #4] mov r1, #0x30 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #8] mov r1, #0 mov r2, #0x30 @@ -50184,7 +50184,7 @@ _021EE93A: b _021EE95E _021EE94C: add r0, r6, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -50325,7 +50325,7 @@ ov16_021EEA3C: ; 0x021EEA3C add r4, r1, #0 add r0, r6, #0 mov r1, #4 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #4] mov r0, #0xf8 str r0, [sp] @@ -50381,7 +50381,7 @@ ov16_021EEAA0: ; 0x021EEAA0 ldr r0, [r4] bl sub_0202212C ldr r0, [r4, #4] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #4] pop {r4, pc} @@ -50464,7 +50464,7 @@ ov16_021EEB10: ; 0x021EEB10 ldr r0, [r5, #0x2c] cmp r0, #0 beq _021EEB4A - bl FreeToHeap + bl Heap_Free _021EEB4A: add sp, #8 pop {r3, r4, r5, pc} @@ -50512,7 +50512,7 @@ ov16_021EEB50: ; 0x021EEB50 ldr r0, [r0] bl LoadRectToBgTilemapRect add r0, r5, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4] mov r1, #6 ldr r0, [r0] @@ -50835,7 +50835,7 @@ _021EEE1E: ldr r0, [r6] cmp r0, #0 beq _021EEE2C - bl FreeToHeap + bl Heap_Free _021EEE2C: ldr r0, [sp, #4] ldr r3, [sp, #0x34] @@ -50975,7 +50975,7 @@ ov16_021EEF0C: ; 0x021EEF0C mov r1, #0x7a ldr r0, [r5, #0xc] lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x7a add r4, r0, #0 mov r1, #0 @@ -51020,7 +51020,7 @@ ov16_021EEF68: ; 0x021EEF68 ldr r0, [r4, r0] bl SysTask_Destroy add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov16_021EEF68 @@ -52094,7 +52094,7 @@ ov16_021EF790: ; 0x021EF790 add r0, r5, #0 bl LoadRectToBgTilemapRect add r0, r6, #0 - bl FreeToHeap + bl Heap_Free str r4, [sp] mov r0, #0x45 mov r1, #0x33 @@ -52118,7 +52118,7 @@ ov16_021EF790: ; 0x021EF790 add r0, r5, #0 bl LoadRectToBgTilemapRect add r0, r6, #0 - bl FreeToHeap + bl Heap_Free str r4, [sp] mov r0, #0x45 mov r1, #0x34 @@ -52143,7 +52143,7 @@ ov16_021EF790: ; 0x021EF790 add r0, r5, #0 bl LoadRectToBgTilemapRect add r0, r6, #0 - bl FreeToHeap + bl Heap_Free str r4, [sp] mov r0, #0x45 mov r1, #0x36 @@ -52168,7 +52168,7 @@ ov16_021EF790: ; 0x021EF790 add r0, r5, #0 bl LoadRectToBgTilemapRect add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 mov r1, #3 bl ScheduleBgTilemapBufferTransfer @@ -52216,7 +52216,7 @@ ov16_021EF8A8: ; 0x021EF8A8 add r0, r4, #0 bl LoadRectToBgTilemapRect add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 mov r1, #2 bl ScheduleBgTilemapBufferTransfer @@ -52589,7 +52589,7 @@ ov16_021EFBA4: ; 0x021EFBA4 mov r4, #0 _021EFBAA: ldr r0, [r5] - bl FreeToHeap + bl Heap_Free add r4, r4, #1 cmp r4, #2 blt _021EFBAA diff --git a/arm9/overlays/17/asm/overlay_17.s b/arm9/overlays/17/asm/overlay_17.s index a2ba7b2e1..21f908a89 100644 --- a/arm9/overlays/17/asm/overlay_17.s +++ b/arm9/overlays/17/asm/overlay_17.s @@ -10,12 +10,12 @@ ov17_021D74E0: ; 0x021D74E0 add r5, r0, #0 add r0, r7, #0 mov r1, #8 - bl AllocFromHeap + bl Heap_Alloc lsl r6, r5, #3 add r4, r0, #0 add r0, r7, #0 add r1, r6, #0 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 add r2, r6, #0 str r0, [r4] @@ -31,9 +31,9 @@ ov17_021D750C: ; 0x021D750C push {r4, lr} add r4, r0, #0 ldr r0, [r4] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov17_021D750C @@ -484,7 +484,7 @@ ov17_021D7828: ; 0x021D7828 add r0, r4, #0 bl ov17_021D8058 ldr r0, [r4, #0x38] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl ov17_021D834C add r0, r4, #0 @@ -492,11 +492,11 @@ ov17_021D7828: ; 0x021D7828 add r0, r4, #0 bl ov17_021D80B4 ldr r0, [r4, #4] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #4] ldr r0, [r4, #0x10] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #0x10] pop {r4, pc} @@ -1003,11 +1003,11 @@ ov17_021D7BE4: ; 0x021D7BE4 add r0, r4, #0 bl ov17_021D834C ldr r0, [r4, #4] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #4] ldr r0, [r4, #0x10] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #0x10] pop {r4, pc} @@ -1125,7 +1125,7 @@ ov17_021D7CD8: ; 0x021D7CD8 add r4, r0, #0 bl ov17_021D8058 ldr r0, [r4, #0x38] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl ov17_021D816C pop {r4, pc} @@ -1297,7 +1297,7 @@ ov17_021D7E1C: ; 0x021D7E1C mov r1, #0x76 ldr r0, [r4, #0xc] lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #4] mov r0, #0x76 str r0, [r5, #8] @@ -1305,7 +1305,7 @@ ov17_021D7E1C: ; 0x021D7E1C str r0, [r5, #0xc] ldr r0, [r4, #0xc] mov r1, #0x4c - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x10] mov r0, #0x13 str r0, [r5, #0x14] @@ -1611,7 +1611,7 @@ ov17_021D8088: ; 0x021D8088 str r0, [r4, #0x2c] mov r0, #0xe lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x77 mov r1, #0 lsl r2, r2, #2 @@ -1628,7 +1628,7 @@ ov17_021D80B4: ; 0x021D80B4 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x30] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x2c] bl sub_02020C90 mov r0, #0 @@ -1899,7 +1899,7 @@ ov17_021D82D4: ; 0x021D82D4 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x28] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #0x28] pop {r4, pc} @@ -1974,7 +1974,7 @@ ov17_021D8358: ; 0x021D8358 ldr r1, [sp] add r0, r7, #0 add r6, r2, #0 - bl AllocFromHeap + bl Heap_Alloc ldr r2, [sp] mov r1, #0 str r0, [r5] @@ -1989,7 +1989,7 @@ ov17_021D8358: ; 0x021D8358 mul r4, r0 add r0, r7, #0 add r1, r4, #0 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 add r2, r4, #0 str r0, [r5, #8] @@ -2022,11 +2022,11 @@ _021D83BE: str r0, [r4, #0x14] _021D83CC: ldr r0, [r4] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4] ldr r0, [r4, #8] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #8] pop {r4, pc} @@ -2042,12 +2042,12 @@ ov17_021D83E4: ; 0x021D83E4 mov r0, #3 mov r1, #0xd lsl r2, r2, #0x10 - bl CreateHeap + bl Heap_Create mov r2, #1 mov r0, #3 mov r1, #0xe lsl r2, r2, #0x12 - bl CreateHeap + bl Heap_Create ldr r1, _021D84D8 ; =0x000006D8 add r0, r4, #0 mov r2, #0xd @@ -2511,9 +2511,9 @@ _021D87F0: add r0, r6, #0 bl OverlayManager_FreeData mov r0, #0xd - bl DestroyHeap + bl Heap_Destroy mov r0, #0xe - bl DestroyHeap + bl Heap_Destroy mov r0, #1 pop {r4, r5, r6, pc} nop @@ -2532,12 +2532,12 @@ ov17_021D8818: ; 0x021D8818 mov r0, #3 mov r1, #0xd lsl r2, r2, #0x10 - bl CreateHeap + bl Heap_Create mov r2, #1 mov r0, #3 mov r1, #0xe lsl r2, r2, #0x12 - bl CreateHeap + bl Heap_Create ldr r1, _021D897C ; =0x000006D8 add r0, r5, #0 mov r2, #0xd @@ -3119,9 +3119,9 @@ _021D8D30: add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0xd - bl DestroyHeap + bl Heap_Destroy mov r0, #0xe - bl DestroyHeap + bl Heap_Destroy bl sub_02083404 bl sub_02033ED0 mov r0, #1 @@ -4324,7 +4324,7 @@ ov17_021D964C: ; 0x021D964C mov r1, #0xac str r2, [sp, #4] add r4, r3, #0 - bl AllocFromHeap + bl Heap_Alloc add r6, r0, #0 bl ov17_021D9CD4 ldr r1, [sp] @@ -4394,7 +4394,7 @@ _021D96DE: add r0, r7, #0 bl sub_02027710 add r0, r6, #0 - bl FreeToHeap + bl Heap_Free add sp, #8 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -7258,7 +7258,7 @@ ov17_021DAB48: ; 0x021DAB48 add r5, r0, #0 mov r0, #0xe lsl r1, r4, #4 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5] str r4, [r5, #4] mov r6, #0 @@ -7294,7 +7294,7 @@ ov17_021DAB8C: ; 0x021DAB8C push {r4, lr} add r4, r0, #0 ldr r0, [r4] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4] strb r0, [r4] @@ -7495,7 +7495,7 @@ ov17_021DACA4: ; 0x021DACA4 mov r0, #0xd mul r1, r2 str r2, [r4, #0x2c] - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #0x28] cmp r0, #0 bne _021DAD04 @@ -7683,7 +7683,7 @@ _021DAE40: mov r1, #0 str r1, [r0, #0x3c] ldr r0, [r4, #0x28] - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl sub_0200621C add sp, #4 @@ -7983,7 +7983,7 @@ ov17_021DB038: ; 0x021DB038 bl ov17_021DAF48 mov r0, #0xd mov r1, #0x34 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5] mov r1, #0 mov r2, #0x34 @@ -8017,7 +8017,7 @@ ov17_021DB08C: ; 0x021DB08C push {r4, lr} add r4, r0, #0 ldr r0, [r4] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl ov17_021DAF48 pop {r4, pc} @@ -8928,7 +8928,7 @@ ov17_021DB700: ; 0x021DB700 strb r0, [r5, #8] add r0, r6, #0 strb r7, [r5, #9] - bl FreeToHeap + bl Heap_Free str r4, [r5, #0xc] add sp, #0x1c pop {r4, r5, r6, r7, pc} @@ -9273,7 +9273,7 @@ ov17_021DB9F4: ; 0x021DB9F4 add r5, r0, #0 add r0, r2, #0 add r1, r4, #0 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5] cmp r0, #0 bne _021DBA0E @@ -9292,7 +9292,7 @@ ov17_021DBA1C: ; 0x021DBA1C push {r4, lr} add r4, r0, #0 ldr r0, [r4] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4] str r0, [r4, #4] @@ -9832,7 +9832,7 @@ _021DBDAA: ldr r3, [r3, #0x14] bl ov17_021DC004 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _021DBDE4: add sp, #0x18 pop {r3, r4, r5, pc} @@ -9869,7 +9869,7 @@ ov17_021DBDE8: ; 0x021DBDE8 ldr r3, [r3, #0x14] bl ov17_021DC004 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r1, #0x18 mov r0, #0 _021DBE2E: @@ -10045,7 +10045,7 @@ _021DBF2A: ldr r1, [r5, #0x1c] bl ov17_021DC004 ldr r0, [sp, #0x20] - bl FreeToHeap + bl Heap_Free cmp r4, #0 beq _021DBF86 str r7, [r4] @@ -10190,7 +10190,7 @@ ov17_021DC084: ; 0x021DC084 mov r1, #0x14 add r5, r2, #0 add r6, r3, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 add r2, r4, #0 mov r1, #0x14 @@ -10231,7 +10231,7 @@ ov17_021DC0D4: ; 0x021DC0D4 mov r1, #0x14 add r5, r2, #0 add r6, r3, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 add r2, r4, #0 mov r1, #0x14 @@ -10282,9 +10282,9 @@ ov17_021DC11C: ; 0x021DC11C add r0, r5, #0 bl SysTask_Destroy ldr r0, [r4, #8] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end ov17_021DC11C @@ -10319,9 +10319,9 @@ _021DC18C: add r0, r5, #0 bl SysTask_Destroy ldr r0, [r4, #4] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, pc} thumb_func_end ov17_021DC158 @@ -12981,9 +12981,9 @@ _021DD552: mov r0, #0x8a lsl r0, r0, #2 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov17_021DD540 @@ -13197,7 +13197,7 @@ ov17_021DD6DC: ; 0x021DD6DC mov r1, #0x97 ldr r0, [r5, #0x68] lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x97 mov r1, #0 lsl r2, r2, #2 @@ -13267,7 +13267,7 @@ ov17_021DD778: ; 0x021DD778 mov r1, #0x97 ldr r0, [r5, #0x68] lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x97 mov r1, #0 lsl r2, r2, #2 @@ -13780,12 +13780,12 @@ ov17_021DDB58: ; 0x021DDB58 mov r0, #3 mov r1, #0xd lsl r2, r2, #0x10 - bl CreateHeap + bl Heap_Create mov r2, #1 mov r0, #3 mov r1, #0xe lsl r2, r2, #0x12 - bl CreateHeap + bl Heap_Create mov r1, #0x65 add r0, r5, #0 lsl r1, r1, #2 @@ -13990,9 +13990,9 @@ ov17_021DDCF4: ; 0x021DDCF4 add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0xd - bl DestroyHeap + bl Heap_Destroy mov r0, #0xe - bl DestroyHeap + bl Heap_Destroy mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 @@ -14085,7 +14085,7 @@ _021DDD96: ldr r0, [r5, #0x4c] bl BgTilemapRectChangePalette add r0, r6, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r5, #0x4c] mov r1, #1 bl ScheduleBgTilemapBufferTransfer @@ -14513,7 +14513,7 @@ ov17_021DE0F4: ; 0x021DE0F4 mov r1, #4 bl BufferBoxMonNickname add r0, r6, #0 - bl FreeToHeap + bl Heap_Free ldr r2, _021DE24C ; =0x00000151 mov r0, #0 mov r1, #0x1a diff --git a/arm9/overlays/18/asm/overlay_18.s b/arm9/overlays/18/asm/overlay_18.s index 0a9035845..a436de29f 100644 --- a/arm9/overlays/18/asm/overlay_18.s +++ b/arm9/overlays/18/asm/overlay_18.s @@ -261,7 +261,7 @@ _02239892: _02239896: ldr r0, _022398A8 ; =0x02251380 ldr r0, [r0] - bl FreeToHeap + bl Heap_Free ldr r0, _022398A8 ; =0x02251380 mov r1, #0 str r1, [r0] @@ -1747,7 +1747,7 @@ ov18_0223A3D4: ; 0x0223A3D4 mov r0, #3 mov r1, #0x1d lsl r2, r2, #0x10 - bl CreateHeap + bl Heap_Create mov r0, #0x1d bl BgConfig_Alloc add r4, r0, #0 @@ -1958,7 +1958,7 @@ _0223A5EC: ldr r0, [r5, #0x18] cmp r0, #0 beq _0223A5F8 - bl FreeToHeap + bl Heap_Free str r6, [r5, #0x18] _0223A5F8: add r4, r4, #1 @@ -1978,13 +1978,13 @@ _0223A5F8: ldr r0, _0223A648 ; =0x02251380 ldr r0, [r0] ldr r0, [r0, #4] - bl FreeToHeap + bl Heap_Free ldr r0, _0223A648 ; =0x02251380 mov r1, #0 ldr r0, [r0] str r1, [r0, #4] mov r0, #0x1d - bl DestroyHeap + bl Heap_Destroy bl ov18_0223D638 ldr r1, _0223A648 ; =0x02251380 ldr r1, [r1] @@ -2526,7 +2526,7 @@ _0223AA5C: lsl r0, r0, #6 str r2, [r1, r0] add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r6, #0 bl SysTask_Destroy mov r0, #1 @@ -2703,7 +2703,7 @@ ov18_0223AC24: ; 0x0223AC24 bl sub_02028AD4 mov r0, #0xb mov r1, #0x54 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0 mov r1, #0 mov r2, #0x54 @@ -6340,7 +6340,7 @@ _0223C7F6: mov r1, #0x5e mov r0, #0xb lsl r1, r1, #4 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r2, #0x5e mov r1, #0 lsl r2, r2, #4 @@ -6386,7 +6386,7 @@ ov18_0223C848: ; 0x0223C848 ldr r1, [r0] ldr r0, _0223C880 ; =0x00000884 ldr r0, [r1, r0] - bl FreeToHeap + bl Heap_Free ldr r1, _0223C878 ; =0x02251380 ldr r0, _0223C87C ; =0x00000878 ldr r2, [r1] @@ -6982,7 +6982,7 @@ ov18_0223CCA8: ; 0x0223CCA8 ldr r0, [r0] cmp r0, #0 beq _0223CCBC - bl FreeToHeap + bl Heap_Free ldr r0, _0223CCC0 ; =0x02251384 mov r1, #0 str r1, [r0] @@ -7843,7 +7843,7 @@ _0223D31E: _0223D330: mov r0, #0xb mov r1, #4 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0 mov r2, #4 add r4, r0, #0 @@ -7884,7 +7884,7 @@ ov18_0223D370: ; 0x0223D370 ldr r1, [r0] ldr r0, _0223D3A8 ; =0x000004C4 ldr r0, [r1, r0] - bl FreeToHeap + bl Heap_Free ldr r1, _0223D3A4 ; =0x02251384 mov r0, #0x13 ldr r2, [r1] @@ -8199,7 +8199,7 @@ _0223D5BC: add r1, #0x8c str r2, [r1] ldr r0, [r0] - bl FreeToHeap + bl Heap_Free ldr r0, _0223D634 ; =0x02251388 mov r1, #0 str r1, [r0] @@ -9526,44 +9526,44 @@ ov18_0223E060: ; 0x0223E060 mov r1, #0x15 mov r0, #0xf lsl r1, r1, #4 - bl AllocFromHeap + bl Heap_Alloc add r1, r5, #0 bl ov18_0223D414 bl sub_0204D320 add r1, r0, #0 mov r0, #0xf - bl AllocFromHeap + bl Heap_Alloc add r1, r5, #0 mov r2, #1 bl sub_0204CB20 bl ov18_0223ECE4 add r1, r0, #0 mov r0, #0xf - bl AllocFromHeap + bl Heap_Alloc add r1, r5, #0 bl ov18_0223E958 bl ov18_02245350 add r1, r0, #0 mov r0, #0xf - bl AllocFromHeap + bl Heap_Alloc add r1, r5, #0 bl ov18_02244ED0 bl ov18_0223CC78 add r1, r0, #0 mov r0, #0xf - bl AllocFromHeap + bl Heap_Alloc add r1, r5, #0 bl ov18_0223CB94 bl ov18_02239848 add r1, r0, #0 mov r0, #0xf - bl AllocFromHeap + bl Heap_Alloc add r1, r5, #0 bl ov18_02239744 bl ov18_0224D360 add r1, r0, #0 mov r0, #0xf - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 add r0, r5, #0 bl FieldSystem_GetSaveData @@ -10821,7 +10821,7 @@ _0223EA12: ldr r0, [r1, r0] cmp r0, #0 beq _0223EA30 - bl FreeToHeap + bl Heap_Free ldr r0, _0223EA3C ; =0x022513A0 mov r2, #0 ldr r1, [r0, #4] @@ -10925,11 +10925,11 @@ _0223EAE2: ldr r0, [r1, r0] cmp r0, #0 beq _0223EAF4 - bl FreeToHeap + bl Heap_Free _0223EAF4: ldr r0, _0223EB04 ; =0x022513A0 ldr r0, [r0, #4] - bl FreeToHeap + bl Heap_Free ldr r0, _0223EB04 ; =0x022513A0 mov r1, #0 str r1, [r0, #4] @@ -14013,7 +14013,7 @@ _022401D2: add r2, r1, #0 bl SetBlendBrightness add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy ldr r2, _02240204 ; =0x022513A0 @@ -14045,7 +14045,7 @@ ov18_02240210: ; 0x02240210 mov r1, #0x1c add r7, r2, #0 str r3, [sp] - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0 mov r2, #0x1c add r4, r0, #0 @@ -14125,7 +14125,7 @@ ov18_022402A0: ; 0x022402A0 add r2, r1, #0 bl SetBlendBrightness add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, _022402EC ; =0x022513A0 ldr r1, [r0, #4] mov r0, #0xa3 @@ -14201,7 +14201,7 @@ ov18_02240334: ; 0x02240334 mov r0, #4 mov r1, #0x20 add r7, r2, #0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0 mov r2, #0x20 add r4, r0, #0 @@ -14403,7 +14403,7 @@ _022404A4: ldr r0, [r1, r0] bl SysTask_Destroy add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r1, _022404EC ; =0x022513A0 mov r0, #0xa3 ldr r2, [r1, #4] @@ -15316,7 +15316,7 @@ ov18_02240BB8: ; 0x02240BB8 bne _02240C08 mov r0, #4 sub r1, #0xb4 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r2, #0x79 mov r1, #0 lsl r2, r2, #2 @@ -15375,7 +15375,7 @@ ov18_02240C14: ; 0x02240C14 mov r0, #0xa6 lsl r0, r0, #2 ldr r0, [r1, r0] - bl FreeToHeap + bl Heap_Free ldr r1, _02240C6C ; =0x022513A0 mov r0, #0xa5 ldr r2, [r1, #4] @@ -15611,7 +15611,7 @@ ov18_02240DC8: ; 0x02240DC8 mov r0, #0xa7 lsl r0, r0, #2 ldr r0, [r1, r0] - bl FreeToHeap + bl Heap_Free ldr r1, _02240E24 ; =0x022513A0 mov r0, #0xa3 ldr r2, [r1, #4] @@ -15700,7 +15700,7 @@ _02240EA4: bl GXx_SetMasterBrightness_ bl sub_020307D0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy ldr r1, _02240EE4 ; =0x022513A0 @@ -15725,7 +15725,7 @@ ov18_02240EE8: ; 0x02240EE8 add r5, r0, #0 mov r0, #4 mov r1, #0x14 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0 mov r2, #0x14 add r4, r0, #0 @@ -15781,7 +15781,7 @@ ov18_02240F34: ; 0x02240F34 ldr r0, [r1, r0] bl SysTask_Destroy add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r1, _02240F80 ; =0x022513A0 mov r0, #0xa3 ldr r2, [r1, #4] @@ -15845,7 +15845,7 @@ _02240FB4: ldr r0, [r1, r0] bl SysTask_Destroy add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r1, _02241000 ; =0x022513A0 mov r0, #0xa3 ldr r2, [r1, #4] @@ -16084,7 +16084,7 @@ _022411B0: ldr r0, [r0, #0x38] bl PlayerAvatar_SetMapObjectYPosition add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy ldr r1, _02241278 ; =0x022513A0 @@ -16187,7 +16187,7 @@ ov18_02241288: ; 0x02241288 mov r0, #4 mov r1, #0x24 add r7, r2, #0 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x24 add r4, r0, #0 @@ -16766,7 +16766,7 @@ _022416D6: mov r0, #0xa7 lsl r0, r0, #2 ldr r0, [r1, r0] - bl FreeToHeap + bl Heap_Free ldr r1, _02241730 ; =0x022513A0 mov r0, #0xa3 ldr r2, [r1, #4] @@ -16793,7 +16793,7 @@ ov18_02241738: ; 0x02241738 mov r0, #4 lsl r1, r1, #4 add r7, r2, #0 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x12 mov r1, #0 lsl r2, r2, #4 @@ -18113,7 +18113,7 @@ ov18_02242180: ; 0x02242180 mov r0, #4 lsl r1, r1, #2 add r6, r2, #0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r2, #0x59 mov r1, #0 lsl r2, r2, #2 @@ -18702,7 +18702,7 @@ _02242604: mov r0, #0xa7 lsl r0, r0, #2 ldr r0, [r1, r0] - bl FreeToHeap + bl Heap_Free ldr r1, _02242658 ; =0x022513A0 mov r0, #0xa3 ldr r2, [r1, #4] @@ -20148,7 +20148,7 @@ ov18_022431A4: ; 0x022431A4 mov r0, #4 lsl r1, r1, #4 add r6, r2, #0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r2, #0x13 mov r1, #0 lsl r2, r2, #4 @@ -20261,7 +20261,7 @@ _02243268: ldr r0, [r1, r0] bl SysTask_Destroy add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r1, _022432AC ; =0x022513A0 mov r0, #0xa3 ldr r2, [r1, #4] @@ -20902,7 +20902,7 @@ ov18_02243794: ; 0x02243794 mov r0, #4 mov r1, #0x30 add r6, r2, #0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0 mov r1, #0 mov r2, #0x30 @@ -21008,7 +21008,7 @@ _02243840: ldr r0, [r1, r0] bl SysTask_Destroy add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r1, _0224388C ; =0x022513A0 mov r0, #0xa3 ldr r2, [r1, #4] @@ -21176,7 +21176,7 @@ ov18_022439A8: ; 0x022439A8 mov r0, #4 mov r1, #0x14 add r6, r2, #0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0 mov r1, #0 mov r2, #0x14 @@ -21272,7 +21272,7 @@ _02243A44: ldr r0, [r1, r0] bl SysTask_Destroy add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r1, _02243A88 ; =0x022513A0 mov r0, #0xa3 ldr r2, [r1, #4] @@ -21711,7 +21711,7 @@ _02243DCA: ldr r0, [sp] bl SysTask_Destroy add r0, r7, #0 - bl FreeToHeap + bl Heap_Free ldr r0, _02243E10 ; =0x022513A0 mov r2, #0 ldr r1, [r0, #4] @@ -21744,7 +21744,7 @@ ov18_02243E18: ; 0x02243E18 bne _02243E82 mov r0, #4 mov r1, #0x34 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0 mov r2, #0x34 add r4, r0, #0 @@ -21798,7 +21798,7 @@ ov18_02243E8C: ; 0x02243E8C bne _02243EA6 bl SysTask_Destroy add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, r5, r6, pc} _02243EA6: ldr r5, [r4, #8] @@ -21824,7 +21824,7 @@ _02243EBE: add r0, r6, #0 bl SysTask_Destroy add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl sub_0204E254 pop {r4, r5, r6, pc} @@ -21919,7 +21919,7 @@ ov18_02243F5C: ; 0x02243F5C bne _02243FA4 mov r0, #4 mov r1, #0x10 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0 mov r2, #0x10 add r4, r0, #0 @@ -21992,7 +21992,7 @@ _02243FFA: bl SysTask_Destroy ldr r0, [r4, #4] ldr r0, [r0, r5] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #4] add r0, r0, r5 str r7, [r0, #0x20] @@ -22018,7 +22018,7 @@ ov18_02244028: ; 0x02244028 add r0, r3, #0 mov r1, #0x24 str r3, [sp, #8] - bl AllocFromHeap + bl Heap_Alloc str r0, [sp, #0xc] mov r1, #0 mov r2, #0x24 @@ -22307,7 +22307,7 @@ _0224425E: blt _0224425E _02244268: ldr r0, [r5, #8] - bl FreeToHeap + bl Heap_Free ldr r0, [sp] ldr r1, [sp] str r0, [r5, #8] @@ -22404,10 +22404,10 @@ ov18_02244318: ; 0x02244318 ldr r0, [r4, #0x10] bl DestroyListMenuCursorObj ldr r0, [r4, #8] - bl FreeToHeap + bl Heap_Free _02244334: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov18_02244318 @@ -24433,7 +24433,7 @@ _02245288: ldr r0, [r0] cmp r0, #0 beq _02245298 - bl FreeToHeap + bl Heap_Free _02245298: ldr r0, _022452A0 ; =0x022513EC mov r1, #0 @@ -25133,7 +25133,7 @@ _022457E6: add r0, r5, #0 bl SysTask_Destroy add r0, r4, #0 - bl FreeToHeap + bl Heap_Free bl ov18_0223E6A0 pop {r3, r4, r5, pc} thumb_func_end ov18_022457D4 @@ -25163,7 +25163,7 @@ _0224580A: add r0, r5, #0 bl SysTask_Destroy add r0, r4, #0 - bl FreeToHeap + bl Heap_Free bl ov18_0223E6A0 bl ov18_022479A0 pop {r3, r4, r5, pc} @@ -25389,7 +25389,7 @@ ov18_022459E8: ; 0x022459E8 bl ov18_02247984 mov r0, #4 mov r1, #0x30 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0 mov r2, #0x30 add r4, r0, #0 @@ -25441,7 +25441,7 @@ ov18_02245A50: ; 0x02245A50 bne _02245AA2 mov r0, #0xb mov r1, #0x30 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0 mov r2, #0x30 add r4, r0, #0 @@ -25908,7 +25908,7 @@ ov18_02245E1C: ; 0x02245E1C mov r1, #0x30 add r7, r2, #0 str r3, [sp] - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0 mov r2, #0x30 add r4, r0, #0 @@ -27115,7 +27115,7 @@ _022467A6: _022467AA: bl sub_0204F7FC add r0, r4, #0 - bl FreeToHeap + bl Heap_Free bl sub_0202EDD8 cmp r0, #0 beq _022467CE @@ -27435,7 +27435,7 @@ _02246A60: ldr r0, [sp, #4] bl SysTask_Destroy add r0, r4, #0 - bl FreeToHeap + bl Heap_Free bl ov18_0223E6A0 add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -27462,7 +27462,7 @@ _02246A80: ldr r0, [sp, #4] bl SysTask_Destroy add r0, r4, #0 - bl FreeToHeap + bl Heap_Free bl ov18_0223E6A0 bl ov18_022479A0 _02246ACA: @@ -27650,7 +27650,7 @@ _02246C28: add r0, r5, #0 bl SysTask_Destroy add r0, r4, #0 - bl FreeToHeap + bl Heap_Free bl ov18_0223E6A0 bl sub_0204F7FC bl ov18_022479A0 @@ -27664,7 +27664,7 @@ ov18_02246C44: ; 0x02246C44 bl ov18_02247984 mov r0, #4 mov r1, #0x14 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0 mov r2, #0x14 add r4, r0, #0 @@ -28539,7 +28539,7 @@ ov18_02247324: ; 0x02247324 push {r4, lr} add r4, r0, #0 add r0, r1, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl SysTask_Destroy pop {r4, pc} @@ -28635,7 +28635,7 @@ _022473DA: pop {r4, r5, pc} _022473F6: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy bl ov18_0223E6A0 @@ -28670,7 +28670,7 @@ ov18_02247428: ; 0x02247428 bne _02247464 mov r0, #0xb mov r1, #8 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #4 add r4, r0, #0 @@ -29479,7 +29479,7 @@ ov18_02247A34: ; 0x02247A34 mov r0, #0x21 mov r1, #0x3c add r7, r2, #0 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x3c add r4, r0, #0 @@ -29639,7 +29639,7 @@ _02247B88: blx r1 _02247B9A: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free bl sub_0204F7FC add r0, r5, #0 bl SysTask_Destroy @@ -31109,7 +31109,7 @@ _02248760: add r1, r4, #0 bl ov18_02248784 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free bl sub_0204F7FC add r0, r5, #0 bl SysTask_Destroy @@ -31927,7 +31927,7 @@ ov18_02248DF8: ; 0x02248DF8 _02248E0C: mov r0, #0x21 mov r1, #0x38 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x38 add r4, r0, #0 @@ -32606,7 +32606,7 @@ ov18_022492F8: ; 0x022492F8 add r4, r0, #0 mov r0, #0xf mov r1, #8 - bl AllocFromHeap + bl Heap_Alloc ldr r1, _02249324 ; =0x022513F8 mov r2, #8 str r0, [r1] @@ -32628,12 +32628,12 @@ _02249324: .word ov18_022513F8 thumb_func_start ov18_02249328 ov18_02249328: ; 0x02249328 ldr r0, _02249330 ; =0x022513F8 - ldr r3, _02249334 ; =FreeToHeap + ldr r3, _02249334 ; =Heap_Free ldr r0, [r0] bx r3 .align 2, 0 _02249330: .word ov18_022513F8 -_02249334: .word FreeToHeap +_02249334: .word Heap_Free thumb_func_end ov18_02249328 thumb_func_start ov18_02249338 @@ -32873,7 +32873,7 @@ ov18_022494C8: ; 0x022494C8 mov r1, #0x25 mov r0, #4 lsl r1, r1, #4 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x25 mov r1, #0 lsl r2, r2, #4 @@ -35162,7 +35162,7 @@ ov18_0224A7C8: ; 0x0224A7C8 add r5, r0, #0 mov r0, #4 lsl r1, r1, #4 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x25 mov r1, #0 lsl r2, r2, #4 @@ -35304,7 +35304,7 @@ _0224A8F0: bl sub_0205EBEC _0224A8FE: add r0, r5, #0 - bl FreeToHeap + bl Heap_Free cmp r4, #0 bne _0224A90C bl sub_0204F7FC @@ -35955,7 +35955,7 @@ _0224AE52: bl SysTask_Destroy _0224AE5C: add r0, r5, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, pc} .align 2, 0 _0224AE64: .word ov18_022513F8 @@ -36064,7 +36064,7 @@ ov18_0224AF28: ; 0x0224AF28 add r5, r0, #0 mov r0, #4 lsl r1, r1, #4 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x25 mov r1, #0 lsl r2, r2, #4 @@ -37347,7 +37347,7 @@ _0224B946: add r0, r4, #0 bl ov18_0224BD54 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add sp, #0xc mov r0, #1 pop {r3, r4, r5, r6, pc} @@ -37393,7 +37393,7 @@ _0224B9B4: add r0, r5, #0 bl SysTask_Destroy add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, pc} thumb_func_end ov18_0224B980 @@ -37696,7 +37696,7 @@ _0224BC5C: bne _0224BC86 mov r0, #0xb mov r1, #0xc - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r1, #0 mov r2, #0xc add r5, r0, #0 @@ -37812,7 +37812,7 @@ ov18_0224BD54: ; 0x0224BD54 mov r1, #0x25 mov r0, #4 lsl r1, r1, #4 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x25 add r4, r0, #0 mov r1, #0 @@ -37928,7 +37928,7 @@ _0224BE5E: pop {r3, r4, r5, pc} _0224BE68: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free bl ov18_0223E6A0 add r0, r5, #0 bl SysTask_Destroy @@ -37951,7 +37951,7 @@ ov18_0224BE84: ; 0x0224BE84 bl sub_020021EC _0224BE96: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy pop {r3, r4, r5, pc} @@ -37965,7 +37965,7 @@ ov18_0224BEA4: ; 0x0224BEA4 add r6, r0, #0 mov r0, #4 lsl r1, r1, #4 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x14 add r4, r0, #0 @@ -39376,7 +39376,7 @@ ov18_0224CA34: ; 0x0224CA34 ldr r0, [r4, #0x70] bl MessageFormat_Delete add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov18_0224CA34 @@ -40346,7 +40346,7 @@ ov18_0224D1F8: ; 0x0224D1F8 mov r1, #0x25 mov r0, #4 lsl r1, r1, #4 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x25 mov r1, #0 lsl r2, r2, #4 @@ -40457,10 +40457,10 @@ ov18_0224D324: ; 0x0224D324 ldr r0, _0224D340 ; =0x022513FC ldr r0, [r0] ldr r0, [r0, #0x10] - bl FreeToHeap + bl Heap_Free ldr r0, _0224D340 ; =0x022513FC ldr r0, [r0] - bl FreeToHeap + bl Heap_Free ldr r0, _0224D340 ; =0x022513FC mov r1, #0 str r1, [r0] @@ -40750,7 +40750,7 @@ ov18_0224D56C: ; 0x0224D56C blx r1 _0224D596: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy ldr r0, _0224D5B0 ; =0x022513FC @@ -40789,7 +40789,7 @@ ov18_0224D5CC: ; 0x0224D5CC mov r1, #0x2c add r5, r2, #0 add r6, r3, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r1, #0 mov r2, #0x2c @@ -40885,7 +40885,7 @@ ov18_0224D698: ; 0x0224D698 add r6, r0, #0 mov r0, #4 add r1, r4, #1 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 add r2, r4, #1 add r5, r0, #0 @@ -40912,7 +40912,7 @@ _0224D6CE: add r2, r4, #1 bl sub_02030ADC add r0, r5, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, r6, r7, pc} nop _0224D6FC: .word ov18_022513FC @@ -41047,7 +41047,7 @@ _0224D7BC: blx r4 add r4, r0, #0 add r0, r6, #0 - bl FreeToHeap + bl Heap_Free bl ov18_0223D658 add r1, r4, #0 bl ov18_0224DEC8 @@ -41229,7 +41229,7 @@ _0224D8FA: mov r3, #0x66 bl AddTextPrinterParameterized ldr r0, [sp, #0x24] - bl FreeToHeap + bl Heap_Free b _0224D9DE _0224D994: ldr r0, [sp, #0x10] @@ -41292,7 +41292,7 @@ ov18_0224DA00: ; 0x0224DA00 mov r1, #0x2c add r6, r2, #0 add r4, r3, #0 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x2c add r5, r0, #0 @@ -41378,7 +41378,7 @@ ov18_0224DAA8: ; 0x0224DAA8 blx r1 _0224DACE: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov18_0224DAA8 @@ -41402,7 +41402,7 @@ ov18_0224DAE0: ; 0x0224DAE0 add r7, r2, #0 str r3, [sp, #4] ldr r6, [sp, #0x20] - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 mov r2, #0x44 add r4, r0, #0 @@ -41464,7 +41464,7 @@ ov18_0224DB5C: ; 0x0224DB5C ldr r0, [r4, #0x24] bl DestroyMsgData add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov18_0224DB5C @@ -42173,12 +42173,12 @@ _0224E018: .word ov18_0225074A thumb_func_start ov18_0224E01C ov18_0224E01C: ; 0x0224E01C - ldr r3, _0224E024 ; =AllocFromHeap + ldr r3, _0224E024 ; =Heap_Alloc mov r0, #4 mov r1, #0x44 bx r3 .align 2, 0 -_0224E024: .word AllocFromHeap +_0224E024: .word Heap_Alloc thumb_func_end ov18_0224E01C thumb_func_start ov18_0224E028 @@ -42211,10 +42211,10 @@ _0224E058: .word 0x000003D9 thumb_func_start ov18_0224E05C ov18_0224E05C: ; 0x0224E05C - ldr r3, _0224E060 ; =FreeToHeap + ldr r3, _0224E060 ; =Heap_Free bx r3 .align 2, 0 -_0224E060: .word FreeToHeap +_0224E060: .word Heap_Free thumb_func_end ov18_0224E05C thumb_func_start ov18_0224E064 @@ -42525,12 +42525,12 @@ _0224E2CC: thumb_func_start ov18_0224E2D8 ov18_0224E2D8: ; 0x0224E2D8 - ldr r3, _0224E2E0 ; =AllocFromHeap + ldr r3, _0224E2E0 ; =Heap_Alloc mov r0, #4 mov r1, #0x4c bx r3 .align 2, 0 -_0224E2E0: .word AllocFromHeap +_0224E2E0: .word Heap_Alloc thumb_func_end ov18_0224E2D8 thumb_func_start ov18_0224E2E4 @@ -42572,10 +42572,10 @@ ov18_0224E314: ; 0x0224E314 thumb_func_start ov18_0224E320 ov18_0224E320: ; 0x0224E320 - ldr r3, _0224E324 ; =FreeToHeap + ldr r3, _0224E324 ; =Heap_Free bx r3 .align 2, 0 -_0224E324: .word FreeToHeap +_0224E324: .word Heap_Free thumb_func_end ov18_0224E320 thumb_func_start ov18_0224E328 @@ -43322,7 +43322,7 @@ _0224E91A: ldr r0, [r4, r0] bl ov05_021D80A4 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #1 pop {r4, r5, r6, pc} _0224E93C: @@ -43473,7 +43473,7 @@ ov18_0224EA74: ; 0x0224EA74 add r5, r0, #0 ldr r1, _0224EAC0 ; =0x00000528 mov r0, #0xb - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd ldr r2, _0224EAC0 ; =0x00000528 add r4, r0, #0 mov r1, #0 @@ -45676,11 +45676,11 @@ _0224FBC4: .word ov18_02251350 thumb_func_start ov18_0224FBC8 ov18_0224FBC8: ; 0x0224FBC8 - ldr r3, _0224FBD0 ; =FreeToHeap + ldr r3, _0224FBD0 ; =Heap_Free ldr r0, [r0, #0x54] bx r3 nop -_0224FBD0: .word FreeToHeap +_0224FBD0: .word Heap_Free thumb_func_end ov18_0224FBC8 thumb_func_start ov18_0224FBD4 diff --git a/arm9/overlays/19/src/overlay_19.c b/arm9/overlays/19/src/overlay_19.c index 9100bf967..58e3e8361 100644 --- a/arm9/overlays/19/src/overlay_19.c +++ b/arm9/overlays/19/src/overlay_19.c @@ -24,7 +24,7 @@ const struct BgTemplate ov19_02252508 = { }; void ov19_02252440(struct BgConfig *bgConfig) { - CreateHeap(3, 8, 0x18000); + Heap_Create(HEAP_ID_MAIN, HEAP_ID_POKETCH_APP, 0x18000); GXS_SetGraphicsMode(GX_BGMODE_0); GX_SetBankForSubBG(0x80); GX_SetBankForSubOBJ(0x100); @@ -39,7 +39,7 @@ void ov19_02252440(struct BgConfig *bgConfig) { void ov19_022524F4(struct BgConfig *bgConfig) { FreeBgTilemapBuffer(bgConfig, GF_BG_LYR_SUB_0); - DestroyHeap(HEAP_ID_POKETCH_APP); + Heap_Destroy(HEAP_ID_POKETCH_APP); } BOOL ov19_02252504(struct BgConfig *bgConfig) { diff --git a/arm9/overlays/20/asm/ov20_02252440.s b/arm9/overlays/20/asm/ov20_02252440.s index 3512b7d8f..c18497d25 100644 --- a/arm9/overlays/20/asm/ov20_02252440.s +++ b/arm9/overlays/20/asm/ov20_02252440.s @@ -21,14 +21,14 @@ ov20_02252448: ; 0x02252448 mov r1, #7 lsl r2, r0, #0xe add r7, r3, #0 - bl CreateHeap + bl Heap_Create mov r0, #3 mov r1, #8 lsl r2, r0, #0xe - bl CreateHeap + bl Heap_Create mov r0, #7 mov r1, #0x60 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _022524B2 str r4, [r5] @@ -234,13 +234,13 @@ _022525C6: add r0, r4, #0 bl ov20_0225257C add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy mov r0, #7 - bl DestroyHeap + bl Heap_Destroy mov r0, #8 - bl DestroyHeap + bl Heap_Destroy pop {r3, r4, r5, pc} .align 2, 0 _022525EC: .word ov20_022544CC diff --git a/arm9/overlays/20/asm/ov20_02252C5C.s b/arm9/overlays/20/asm/ov20_02252C5C.s index 6a2580dd0..418fbdec7 100644 --- a/arm9/overlays/20/asm/ov20_02252C5C.s +++ b/arm9/overlays/20/asm/ov20_02252C5C.s @@ -13,7 +13,7 @@ ov20_02252C5C: ; 0x02252C5C lsl r1, r1, #2 add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc str r0, [r5] add r4, r0, #0 beq _02252D0A @@ -34,7 +34,7 @@ ov20_02252C5C: ; 0x02252C5C cmp r0, #0 bne _02252CA6 ldr r0, [r5] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r5] pop {r3, r4, r5, r6, r7, pc} @@ -145,7 +145,7 @@ ov20_02252D44: ; 0x02252D44 add r1, #0x78 bl DC_FlushRange add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02252D7A: pop {r3, r4, r5, pc} thumb_func_end ov20_02252D44 @@ -247,7 +247,7 @@ _02252E36: ldr r0, [r4, r0] cmp r0, #0 beq _02252E44 - bl FreeToHeap + bl Heap_Free _02252E44: mov r0, #0x56 lsl r0, r0, #2 @@ -257,7 +257,7 @@ _02252E44: bl SysTask_Destroy _02252E52: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02252E58: pop {r4, pc} .align 2, 0 diff --git a/arm9/overlays/20/asm/ov20_022536F4.s b/arm9/overlays/20/asm/ov20_022536F4.s index 740ba1ad0..11d2fcf0f 100644 --- a/arm9/overlays/20/asm/ov20_022536F4.s +++ b/arm9/overlays/20/asm/ov20_022536F4.s @@ -182,7 +182,7 @@ _022537FA: ldr r0, [sp, #0x28] ldr r1, [r1, r6] add r1, #0x18 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02253870 ldr r0, [sp, #8] @@ -223,7 +223,7 @@ _0225382E: pop {r4, r5, r6, r7, pc} _02253866: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0xc pop {r4, r5, r6, r7, pc} _02253870: @@ -251,7 +251,7 @@ ov20_02253888: ; 0x02253888 ldr r0, [r4, #0x14] bl SysTask_Destroy add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov20_02253888 @@ -332,7 +332,7 @@ ov20_022538F4: ; 0x022538F4 add r6, r1, #0 mov r0, #8 mov r1, #0x20 - bl AllocFromHeap + bl Heap_Alloc add r7, r0, #0 beq _02253960 bl ov20_02252DEC @@ -379,7 +379,7 @@ _02253948: blo _02253910 _0225395A: add r0, r7, #0 - bl FreeToHeap + bl Heap_Free _02253960: pop {r3, r4, r5, r6, r7, pc} nop @@ -394,12 +394,12 @@ ov20_0225396C: ; 0x0225396C add r7, r1, #0 mov r0, #8 mov r1, #0x20 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _022539C2 mov r0, #8 mov r1, #0x20 - bl AllocFromHeap + bl Heap_Alloc add r5, r0, #0 add r0, r4, #0 bl ov20_02252DEC @@ -423,10 +423,10 @@ _02253998: mov r2, #0x20 bl GXS_LoadOBJPltt add r0, r5, #0 - bl FreeToHeap + bl Heap_Free _022539BC: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _022539C2: pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov20_0225396C @@ -457,7 +457,7 @@ ov20_022539C4: ; 0x022539C4 mov r2, #0x80 bl GXS_LoadOBJPltt add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02253A02: pop {r3, r4, r5, pc} thumb_func_end ov20_022539C4 @@ -475,7 +475,7 @@ ov20_02253A04: ; 0x02253A04 ldr r1, [sp, #0xc] mov r0, #8 ldrh r1, [r2, r1] - bl AllocFromHeap + bl Heap_Alloc add r7, r0, #0 beq _02253A98 mov r0, #0x13 @@ -532,7 +532,7 @@ _02253A8C: bl NARC_Delete _02253A92: add r0, r7, #0 - bl FreeToHeap + bl Heap_Free _02253A98: add sp, #0x24 pop {r4, r5, r6, r7, pc} diff --git a/arm9/overlays/20/asm/ov20_02253BA4.s b/arm9/overlays/20/asm/ov20_02253BA4.s index 5647ec057..2b25ee048 100644 --- a/arm9/overlays/20/asm/ov20_02253BA4.s +++ b/arm9/overlays/20/asm/ov20_02253BA4.s @@ -11,7 +11,7 @@ ov20_02253BA4: ; 0x02253BA4 add r0, r5, #0 mov r1, #0x1c mov r6, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02253C0E add r0, r6, #0 @@ -26,7 +26,7 @@ ov20_02253BA4: ; 0x02253BA4 ldrh r1, [r4, #0x10] add r0, r5, #0 lsl r1, r1, #3 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #0x14] cmp r0, #0 beq _02253C0E @@ -34,14 +34,14 @@ ov20_02253BA4: ; 0x02253BA4 mov r1, #0x90 add r0, r5, #0 mul r1, r2 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #0xc] cmp r0, #0 beq _02253C0E ldrh r1, [r4, #0x10] add r0, r5, #0 lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #4] cmp r0, #0 beq _02253C0E @@ -61,23 +61,23 @@ _02253C0E: cmp r1, #0 beq _02253C22 add r0, r5, #0 - bl FreeToHeapExplicit + bl Heap_FreeExplicit _02253C22: ldr r1, [r4, #0xc] cmp r1, #0 beq _02253C2E add r0, r5, #0 - bl FreeToHeapExplicit + bl Heap_FreeExplicit _02253C2E: ldr r1, [r4, #4] cmp r1, #0 beq _02253C3A add r0, r5, #0 - bl FreeToHeapExplicit + bl Heap_FreeExplicit _02253C3A: add r0, r5, #0 add r1, r4, #0 - bl FreeToHeapExplicit + bl Heap_FreeExplicit _02253C42: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -95,20 +95,20 @@ ov20_02253C4C: ; 0x02253C4C ldr r0, [r4, #0x14] cmp r0, #0 beq _02253C5C - bl FreeToHeap + bl Heap_Free _02253C5C: ldr r0, [r4, #0xc] cmp r0, #0 beq _02253C66 - bl FreeToHeap + bl Heap_Free _02253C66: ldr r0, [r4, #4] cmp r0, #0 beq _02253C70 - bl FreeToHeap + bl Heap_Free _02253C70: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02253C76: pop {r4, pc} thumb_func_end ov20_02253C4C @@ -630,7 +630,7 @@ ov20_02254014: ; 0x02254014 cmp r1, #0 beq _02254028 ldr r0, [r4, #0x10] - bl FreeToHeapExplicit + bl Heap_FreeExplicit mov r0, #0 str r0, [r4] _02254028: @@ -638,7 +638,7 @@ _02254028: cmp r1, #0 beq _02254038 ldr r0, [r4, #0x10] - bl FreeToHeapExplicit + bl Heap_FreeExplicit mov r0, #0 str r0, [r4, #4] _02254038: diff --git a/arm9/overlays/20/asm/ov20_02254130.s b/arm9/overlays/20/asm/ov20_02254130.s index b91d9d2f2..7b3030c08 100644 --- a/arm9/overlays/20/asm/ov20_02254130.s +++ b/arm9/overlays/20/asm/ov20_02254130.s @@ -17,7 +17,7 @@ ov20_02254130: ; 0x02254130 _02254144: add r0, r5, #0 mov r1, #0x18 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254192 ldr r0, [sp] @@ -30,7 +30,7 @@ _02254144: str r0, [r4, #0x10] add r0, r5, #0 mul r1, r7 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #0x14] cmp r0, #0 beq _02254188 @@ -50,7 +50,7 @@ _02254176: _02254188: add r0, r5, #0 add r1, r4, #0 - bl FreeToHeapExplicit + bl Heap_FreeExplicit mov r4, #0 _02254192: add r0, r4, #0 @@ -67,10 +67,10 @@ ov20_02254198: ; 0x02254198 _022541A2: ldr r0, [r4, #8] ldr r1, [r4, #0x14] - bl FreeToHeapExplicit + bl Heap_FreeExplicit ldr r0, [r4, #8] add r1, r4, #0 - bl FreeToHeapExplicit + bl Heap_FreeExplicit pop {r4, pc} thumb_func_end ov20_02254198 diff --git a/arm9/overlays/21/src/ov21_02254854.c b/arm9/overlays/21/src/ov21_02254854.c index 8b96504e8..0ff1eb8a7 100644 --- a/arm9/overlays/21/src/ov21_02254854.c +++ b/arm9/overlays/21/src/ov21_02254854.c @@ -26,13 +26,13 @@ static void ov21_02254840(void) { #include "sinit.h" BOOL ov21_02254854(UnkStruct02254854 **param0, u32 param1, u32 param2, u32 param3) { - UnkStruct02254854 *alloced = (UnkStruct02254854 *)AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct02254854)); + UnkStruct02254854 *alloced = (UnkStruct02254854 *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct02254854)); if (alloced != NULL) { if (ov21_0225489C(alloced, param1, param2, param3) && SysTask_CreateOnMainQueue((SysTaskFunc)ov21_02254930, (void *)alloced, 1)) { *param0 = alloced; return TRUE; } - FreeToHeap(alloced); + Heap_Free(alloced); } return FALSE; } @@ -70,7 +70,7 @@ BOOL (*const ov21_02254D84[])(UnkStruct02254854 *) = { ov21_022549A4, ov21_02254 void ov21_02254918(UnkStruct02254854 *param0) { ov21_02254B04(param0->Unk24); ov20_02254198(param0->Unk10); - FreeToHeap((void *)param0); + Heap_Free((void *)param0); } void ov21_02254930(SysTask *task, UnkStruct02254854 *param1) { diff --git a/arm9/overlays/21/src/ov21_02254A6C.c b/arm9/overlays/21/src/ov21_02254A6C.c index 1dc1f1a5c..5743e2667 100644 --- a/arm9/overlays/21/src/ov21_02254A6C.c +++ b/arm9/overlays/21/src/ov21_02254A6C.c @@ -39,7 +39,7 @@ extern void CopyToBgTilemapRect(u32 param0, u32 param1, u32 param2, u32 param3, extern void ov11_02252DB4(u32 param0, u32 param1); BOOL ov21_02254A6C(UnkStruct02254A6C *param0, void *param1) { - UnkStruct02254A6C *strct = (UnkStruct02254A6C *)AllocFromHeap(HEAP_ID_POKETCH_APP, 3 << 8); + UnkStruct02254A6C *strct = (UnkStruct02254A6C *)Heap_Alloc(HEAP_ID_POKETCH_APP, 3 << 8); u32 sp4; if (strct != NULL) { ov20_022536F4(strct->Unk08, 8); @@ -47,11 +47,11 @@ BOOL ov21_02254A6C(UnkStruct02254A6C *param0, void *param1) { strct->Unk04 = ov20_02252D34(); void *res = GfGfxLoader_GetScrnData(12, 0x19, 1, &sp4, 8); if (res == 0) { - FreeToHeap(strct); + Heap_Free(strct); return FALSE; } ov21_02254AD4((void *)(sp4 + 0xc), strct->Unk30); - FreeToHeap(res); + Heap_Free(res); param0->Unk00 = strct; return TRUE; } @@ -71,7 +71,7 @@ void ov21_02254AD4(void *param0, void *param1) { void ov21_02254B04(void *param0) { if (param0 != NULL) { - FreeToHeap(param0); + Heap_Free(param0); } } diff --git a/arm9/overlays/22/asm/overlay_22.s b/arm9/overlays/22/asm/overlay_22.s index ea4d379c0..2969f5145 100644 --- a/arm9/overlays/22/asm/overlay_22.s +++ b/arm9/overlays/22/asm/overlay_22.s @@ -12,7 +12,7 @@ ov22_02254854: ; 0x02254854 mov r1, #0x68 add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254892 ldr r2, [sp] @@ -32,7 +32,7 @@ ov22_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -151,7 +151,7 @@ ov22_0225492C: ; 0x0225492C ldr r0, [r4, #0x60] bl ov22_02254F10 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov22_0225492C @@ -868,7 +868,7 @@ ov22_02254E8C: ; 0x02254E8C add r6, r1, #0 mov r0, #8 mov r1, #0x88 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254F08 str r6, [r4] @@ -934,10 +934,10 @@ ov22_02254F10: ; 0x02254F10 ldr r0, [r4, #4] cmp r0, #0 beq _02254F20 - bl FreeToHeap + bl Heap_Free _02254F20: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254F26: pop {r4, pc} thumb_func_end ov22_02254F10 diff --git a/arm9/overlays/23/asm/overlay_23.s b/arm9/overlays/23/asm/overlay_23.s index 17435cfb2..febd31cbe 100644 --- a/arm9/overlays/23/asm/overlay_23.s +++ b/arm9/overlays/23/asm/overlay_23.s @@ -12,7 +12,7 @@ ov23_02254854: ; 0x02254854 mov r1, #0x28 add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254888 ldr r1, [sp] @@ -166,7 +166,7 @@ _02254964: add r0, r4, #0 bl ov23_02254918 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy ldr r0, [r4, #0x10] @@ -1061,7 +1061,7 @@ ov23_02254FFC: ; 0x02254FFC ldr r1, _02255028 ; =0x0000048C mov r0, #8 add r7, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02255022 str r6, [r4] @@ -1084,7 +1084,7 @@ ov23_0225502C: ; 0x0225502C push {r3, lr} cmp r0, #0 beq _02255036 - bl FreeToHeap + bl Heap_Free _02255036: pop {r3, pc} thumb_func_end ov23_0225502C @@ -1718,7 +1718,7 @@ ov23_0225551C: ; 0x0225551C add r4, r1, #0 mov r0, #8 mov r1, #0xc - bl AllocFromHeap + bl Heap_Alloc str r0, [r5] cmp r0, #0 beq _0225553C @@ -1734,10 +1734,10 @@ _0225553C: thumb_func_start ov23_02255540 ov23_02255540: ; 0x02255540 - ldr r3, _02255544 ; =FreeToHeap + ldr r3, _02255544 ; =Heap_Free bx r3 .align 2, 0 -_02255544: .word FreeToHeap +_02255544: .word Heap_Free thumb_func_end ov23_02255540 thumb_func_start ov23_02255548 diff --git a/arm9/overlays/24/src/ov24_02254840.c b/arm9/overlays/24/src/ov24_02254840.c index 6477fafc9..fecf6c9d4 100644 --- a/arm9/overlays/24/src/ov24_02254840.c +++ b/arm9/overlays/24/src/ov24_02254840.c @@ -22,7 +22,7 @@ static void ov24_02254840(void) { #include "sinit.h" BOOL ov24_02254854(MemoPadAppHandler **appHandlerOut, s32 arg1, s32 arg2, s32 arg3) { - MemoPadAppHandler *appHandler = AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(MemoPadAppHandler)); + MemoPadAppHandler *appHandler = Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(MemoPadAppHandler)); if (appHandler != NULL) { if (ov24_0225489C(appHandler, arg1, arg2, arg3)) { if (SysTask_CreateOnMainQueue((SysTaskFunc)ov24_02254918, appHandler, 1) != NULL) { @@ -30,7 +30,7 @@ BOOL ov24_02254854(MemoPadAppHandler **appHandlerOut, s32 arg1, s32 arg2, s32 ar return TRUE; } } - FreeToHeap(appHandler); + Heap_Free(appHandler); } return FALSE; } @@ -56,7 +56,7 @@ BOOL ov24_0225489C(MemoPadAppHandler *appHandler, u32 arg1, u32 arg2, u32 arg3) void ov24_022548F4(MemoPadAppHandler *appHandler) { ov20_02254198(appHandler->unk16FC); ov24_02254D48(appHandler->displayHandler); - FreeToHeap(appHandler); + Heap_Free(appHandler); } void ov24_02254918(SysTask *sysTask, MemoPadAppHandler *appHandler) { diff --git a/arm9/overlays/24/src/ov24_02254CA0.c b/arm9/overlays/24/src/ov24_02254CA0.c index f9fab3f7f..13f1e8149 100644 --- a/arm9/overlays/24/src/ov24_02254CA0.c +++ b/arm9/overlays/24/src/ov24_02254CA0.c @@ -20,7 +20,7 @@ extern void ov20_02253888(u32 *arg0, void *arg1); extern BOOL ov20_022537B8(void *arg0); extern BOOL ov20_02253794(void *arg0, u8 arg1); extern void ov20_022537E0(const u32 *arg0, u32 arg1, void *arg2, void *arg3, void *arg4, u32 arg5, u32 arg6); -extern BOOL ov20_02253FBC(void *arg0, NarcId arg1, u32 arg2, u32 arg3, HeapID arg4); +extern BOOL ov20_02253FBC(void *arg0, NarcId arg1, u32 arg2, u32 arg3, enum HeapID arg4); extern u32 *ov20_02253E74(u32 arg0, void *arg1, void *arg2); extern void ov20_02254014(void *arg0); extern void ov20_02253F14(u32 arg0, void *arg1); @@ -29,7 +29,7 @@ extern BgConfig *ov20_02252D34(); extern u32 ov20_02252D24(); BOOL ov24_02254CA0(MemoPadDisplayHandler **displayHandlerOut, MemoPadDrawState *drawState) { - MemoPadDisplayHandler *displayHandler = AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(MemoPadDisplayHandler)); + MemoPadDisplayHandler *displayHandler = Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(MemoPadDisplayHandler)); if (displayHandler != NULL) { GF_ASSERT(GF_heap_c_dummy_return_true(HEAP_ID_POKETCH_MAIN)); ov20_022536F4(&(displayHandler->unk8), 0x10); @@ -71,9 +71,9 @@ void ov24_02254D48(MemoPadDisplayHandler *displayHandler) { if (displayHandler->window != NULL) { sub_02089444(displayHandler->drawState->unk16E8, displayHandler->window->pixelBuffer, 0x2f80); RemoveWindow(displayHandler->window); - FreeToHeap(displayHandler->window); + Heap_Free(displayHandler->window); } - FreeToHeap(displayHandler); + Heap_Free(displayHandler); } } diff --git a/arm9/overlays/25/asm/overlay_25.s b/arm9/overlays/25/asm/overlay_25.s index 58d7921c9..f704a4e7a 100644 --- a/arm9/overlays/25/asm/overlay_25.s +++ b/arm9/overlays/25/asm/overlay_25.s @@ -12,7 +12,7 @@ ov25_02254854: ; 0x02254854 mov r1, #0x2c add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -32,7 +32,7 @@ ov25_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -112,7 +112,7 @@ ov25_02254918: ; 0x02254918 ldr r0, [r4, #0x10] bl ov20_02254198 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov25_02254918 @@ -308,7 +308,7 @@ ov25_02254A6C: ; 0x02254A6C add r6, r1, #0 mov r0, #8 mov r1, #0x54 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254ABA add r0, #8 @@ -324,7 +324,7 @@ ov25_02254A6C: ; 0x02254A6C cmp r0, #0 bne _02254AA8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #0 pop {r4, r5, r6, pc} _02254AA8: @@ -355,7 +355,7 @@ ov25_02254AC4: ; 0x02254AC4 bl SysTask_Destroy _02254AD8: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254ADE: pop {r4, pc} thumb_func_end ov25_02254AC4 diff --git a/arm9/overlays/26/asm/ov26_02254854.s b/arm9/overlays/26/asm/ov26_02254854.s index b5cb293d8..8b9f28806 100644 --- a/arm9/overlays/26/asm/ov26_02254854.s +++ b/arm9/overlays/26/asm/ov26_02254854.s @@ -13,7 +13,7 @@ ov26_02254854: ; 0x02254854 lsl r1, r1, #2 add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _0225489C ldr r3, [sp] @@ -36,7 +36,7 @@ ov26_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _02254896: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _0225489C: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -255,7 +255,7 @@ ov26_02254A04: ; 0x02254A04 ldr r0, [r4, r0] bl ov26_02254C04 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov26_02254A04 diff --git a/arm9/overlays/26/asm/ov26_02254BD4.s b/arm9/overlays/26/asm/ov26_02254BD4.s index 69b48b04d..d8d5359d5 100644 --- a/arm9/overlays/26/asm/ov26_02254BD4.s +++ b/arm9/overlays/26/asm/ov26_02254BD4.s @@ -10,7 +10,7 @@ ov26_02254BD4: ; 0x02254BD4 add r6, r1, #0 mov r0, #8 mov r1, #0x30 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254C00 add r0, #8 @@ -34,7 +34,7 @@ ov26_02254C04: ; 0x02254C04 push {r3, lr} cmp r0, #0 beq _02254C0E - bl FreeToHeap + bl Heap_Free _02254C0E: pop {r3, pc} thumb_func_end ov26_02254C04 @@ -141,7 +141,7 @@ ov26_02254CC4: ; 0x02254CC4 str r0, [sp, #4] mov r0, #8 lsl r1, r0, #6 - bl AllocFromHeap + bl Heap_Alloc str r0, [sp, #0x1c] cmp r0, #0 beq _02254D68 @@ -214,7 +214,7 @@ _02254CEC: lsl r3, r3, #8 bl BG_LoadCharTilesData ldr r0, [sp, #0x1c] - bl FreeToHeap + bl Heap_Free _02254D68: add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} diff --git a/arm9/overlays/27/asm/overlay_27.s b/arm9/overlays/27/asm/overlay_27.s index c99b57e2f..969a8add3 100644 --- a/arm9/overlays/27/asm/overlay_27.s +++ b/arm9/overlays/27/asm/overlay_27.s @@ -12,7 +12,7 @@ ov27_02254854: ; 0x02254854 mov r1, #0x7c add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -32,7 +32,7 @@ ov27_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -84,7 +84,7 @@ ov27_022548E4: ; 0x022548E4 ldr r0, [r4, #0x74] bl ov27_02254B88 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov27_022548E4 @@ -363,7 +363,7 @@ ov27_02254AF0: ; 0x02254AF0 str r0, [sp, #4] mov r0, #8 lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc str r0, [sp, #8] cmp r0, #0 beq _02254B82 @@ -449,7 +449,7 @@ ov27_02254B88: ; 0x02254B88 bl SysTask_Destroy _02254BB0: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254BB6: pop {r4, pc} thumb_func_end ov27_02254B88 diff --git a/arm9/overlays/28/asm/overlay_28.s b/arm9/overlays/28/asm/overlay_28.s index 42de736a3..97c53ed1f 100644 --- a/arm9/overlays/28/asm/overlay_28.s +++ b/arm9/overlays/28/asm/overlay_28.s @@ -12,7 +12,7 @@ ov28_02254854: ; 0x02254854 mov r1, #0x64 add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -32,7 +32,7 @@ ov28_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -190,7 +190,7 @@ ov28_022549AC: ; 0x022549AC ldr r0, [r4, #0x5c] bl ov28_02254B70 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov28_022549AC @@ -385,7 +385,7 @@ ov28_02254AF4: ; 0x02254AF4 add r5, r0, #0 mov r0, #8 lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254B6A add r0, #8 @@ -480,7 +480,7 @@ _02254B9A: bl SysTask_Destroy _02254BC0: add r0, r5, #0 - bl FreeToHeap + bl Heap_Free _02254BC6: pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov28_02254B70 @@ -683,7 +683,7 @@ _02254D24: lsl r2, r2, #0xa bl GXS_LoadOBJ ldr r0, [sp, #0x20] - bl FreeToHeap + bl Heap_Free ldrh r0, [r6] mov r1, #1 ldr r2, [sp, #0x24] diff --git a/arm9/overlays/29/asm/overlay_29.s b/arm9/overlays/29/asm/overlay_29.s index e9632513f..c0de6671c 100644 --- a/arm9/overlays/29/asm/overlay_29.s +++ b/arm9/overlays/29/asm/overlay_29.s @@ -12,7 +12,7 @@ ov29_02254854: ; 0x02254854 mov r1, #0x54 add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -32,7 +32,7 @@ ov29_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -71,12 +71,12 @@ ov29_022548C4: ; 0x022548C4 ldr r0, [r4, #0x50] cmp r0, #0 beq _022548D2 - bl FreeToHeap + bl Heap_Free _022548D2: ldr r0, [r4, #0x48] bl ov29_02254C84 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov29_022548C4 @@ -421,7 +421,7 @@ _02254B58: bne _02254AE0 _02254B60: ldr r0, [sp, #4] - bl FreeToHeap + bl Heap_Free _02254B66: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} @@ -485,7 +485,7 @@ ov29_02254BC0: ; 0x02254BC0 add r6, r1, #0 mov r0, #8 mov r1, #0x90 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254C04 add r0, #8 @@ -604,7 +604,7 @@ _02254CAE: add r0, #0x58 bl ov20_02254014 add r0, r6, #0 - bl FreeToHeap + bl Heap_Free _02254CBC: pop {r4, r5, r6, pc} .align 2, 0 diff --git a/arm9/overlays/30/asm/overlay_30.s b/arm9/overlays/30/asm/overlay_30.s index faa40398f..f9023b124 100644 --- a/arm9/overlays/30/asm/overlay_30.s +++ b/arm9/overlays/30/asm/overlay_30.s @@ -12,7 +12,7 @@ ov30_02254854: ; 0x02254854 mov r1, #0x20 add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -32,7 +32,7 @@ ov30_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -116,7 +116,7 @@ ov30_0225490C: ; 0x0225490C ldr r0, [r4, #0x10] bl ov30_02254ACC add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov30_0225490C @@ -326,7 +326,7 @@ ov30_02254A90: ; 0x02254A90 add r5, r1, #0 mov r0, #8 mov r1, #0x60 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254AC6 add r0, #8 @@ -356,7 +356,7 @@ ov30_02254ACC: ; 0x02254ACC beq _02254ADC bl ov30_02254B94 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254ADC: pop {r4, pc} .align 2, 0 diff --git a/arm9/overlays/31/asm/overlay_31.s b/arm9/overlays/31/asm/overlay_31.s index 9580e15ea..7f2c206bf 100644 --- a/arm9/overlays/31/asm/overlay_31.s +++ b/arm9/overlays/31/asm/overlay_31.s @@ -12,7 +12,7 @@ ov31_02254854: ; 0x02254854 mov r1, #0x20 add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -32,7 +32,7 @@ ov31_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -103,7 +103,7 @@ ov31_02254900: ; 0x02254900 ldr r0, [r4, #0xc] bl ov31_02254AC0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov31_02254900 @@ -316,7 +316,7 @@ ov31_02254A84: ; 0x02254A84 add r5, r1, #0 mov r0, #8 mov r1, #0x64 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254ABA add r0, #8 @@ -346,7 +346,7 @@ ov31_02254AC0: ; 0x02254AC0 beq _02254AD0 bl ov31_02254B88 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254AD0: pop {r4, pc} .align 2, 0 diff --git a/arm9/overlays/32/asm/overlay_32.s b/arm9/overlays/32/asm/overlay_32.s index a7cd9e937..1f98375f2 100644 --- a/arm9/overlays/32/asm/overlay_32.s +++ b/arm9/overlays/32/asm/overlay_32.s @@ -12,7 +12,7 @@ ov32_02254854: ; 0x02254854 mov r1, #0x1c add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -32,7 +32,7 @@ ov32_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -102,7 +102,7 @@ ov32_02254900: ; 0x02254900 ldr r0, [r4, #8] bl ov32_02254A90 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov32_02254900 @@ -302,7 +302,7 @@ ov32_02254A54: ; 0x02254A54 add r5, r1, #0 mov r0, #8 mov r1, #0x3c - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254A8A add r0, #8 @@ -330,7 +330,7 @@ ov32_02254A90: ; 0x02254A90 push {r3, lr} cmp r0, #0 beq _02254A9A - bl FreeToHeap + bl Heap_Free _02254A9A: pop {r3, pc} thumb_func_end ov32_02254A90 diff --git a/arm9/overlays/33/asm/ov33_02254854.s b/arm9/overlays/33/asm/ov33_02254854.s index a497013d5..255c94d1f 100644 --- a/arm9/overlays/33/asm/ov33_02254854.s +++ b/arm9/overlays/33/asm/ov33_02254854.s @@ -12,7 +12,7 @@ ov33_02254854: ; 0x02254854 mov r1, #0x10 add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -32,7 +32,7 @@ ov33_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -69,7 +69,7 @@ ov33_022548C0: ; 0x022548C0 ldr r0, [r4, #8] bl ov33_022549DC add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov33_022548C0 diff --git a/arm9/overlays/33/asm/ov33_022549AC.s b/arm9/overlays/33/asm/ov33_022549AC.s index b8680e6b1..757d970d7 100644 --- a/arm9/overlays/33/asm/ov33_022549AC.s +++ b/arm9/overlays/33/asm/ov33_022549AC.s @@ -10,7 +10,7 @@ ov33_022549AC: ; 0x022549AC add r6, r1, #0 mov r0, #8 mov r1, #0x30 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _022549D8 add r0, #8 @@ -34,7 +34,7 @@ ov33_022549DC: ; 0x022549DC push {r3, lr} cmp r0, #0 beq _022549E6 - bl FreeToHeap + bl Heap_Free _022549E6: pop {r3, pc} thumb_func_end ov33_022549DC diff --git a/arm9/overlays/34/asm/overlay_34.s b/arm9/overlays/34/asm/overlay_34.s index 0f2589d57..013027641 100644 --- a/arm9/overlays/34/asm/overlay_34.s +++ b/arm9/overlays/34/asm/overlay_34.s @@ -12,7 +12,7 @@ ov34_02254854: ; 0x02254854 mov r1, #0x38 add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -32,7 +32,7 @@ ov34_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -93,7 +93,7 @@ _022548F6: ldr r0, [r4, #0x24] bl ov34_02254A8C add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov34_022548E8 @@ -301,7 +301,7 @@ ov34_02254A5C: ; 0x02254A5C add r6, r1, #0 mov r0, #8 mov r1, #0x20 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254A88 add r0, #8 @@ -325,7 +325,7 @@ ov34_02254A8C: ; 0x02254A8C push {r3, lr} cmp r0, #0 beq _02254A96 - bl FreeToHeap + bl Heap_Free _02254A96: pop {r3, pc} thumb_func_end ov34_02254A8C diff --git a/arm9/overlays/35/asm/overlay_35.s b/arm9/overlays/35/asm/overlay_35.s index 8d9608da8..102bf828e 100644 --- a/arm9/overlays/35/asm/overlay_35.s +++ b/arm9/overlays/35/asm/overlay_35.s @@ -12,7 +12,7 @@ ov35_02254854: ; 0x02254854 mov r1, #0x34 add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -32,7 +32,7 @@ ov35_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -80,7 +80,7 @@ ov35_022548DC: ; 0x022548DC ldr r0, [r4, #0x28] bl ov35_02254B38 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov35_022548DC @@ -362,7 +362,7 @@ ov35_02254ADC: ; 0x02254ADC add r5, r1, #0 mov r0, #8 mov r1, #0x90 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254B2E add r0, #8 @@ -410,7 +410,7 @@ ov35_02254B38: ; 0x02254B38 ldr r0, [r0] bl SysTask_Destroy add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254B52: pop {r4, pc} thumb_func_end ov35_02254B38 diff --git a/arm9/overlays/36/asm/overlay_36.s b/arm9/overlays/36/asm/overlay_36.s index 687bc6fc7..d3d6a864c 100644 --- a/arm9/overlays/36/asm/overlay_36.s +++ b/arm9/overlays/36/asm/overlay_36.s @@ -12,7 +12,7 @@ ov36_02254854: ; 0x02254854 mov r0, #8 add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -32,7 +32,7 @@ ov36_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -108,7 +108,7 @@ ov36_02254914: ; 0x02254914 ldr r0, [r4, r0] bl ov36_02254E78 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 _02254930: .word 0x00005B84 @@ -813,7 +813,7 @@ ov36_02254E30: ; 0x02254E30 add r5, r1, #0 mov r0, #8 mov r1, #0x70 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254E74 add r0, #8 @@ -849,7 +849,7 @@ ov36_02254E78: ; 0x02254E78 beq _02254E88 bl ov36_02254EE4 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254E88: pop {r4, pc} .align 2, 0 diff --git a/arm9/overlays/37/asm/overlay_37.s b/arm9/overlays/37/asm/overlay_37.s index 8ca6cc369..fdb14ef05 100644 --- a/arm9/overlays/37/asm/overlay_37.s +++ b/arm9/overlays/37/asm/overlay_37.s @@ -12,7 +12,7 @@ ov37_02254854: ; 0x02254854 mov r1, #0x14 add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -32,7 +32,7 @@ ov37_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -90,7 +90,7 @@ ov37_022548E0: ; 0x022548E0 ldr r0, [r4, #0xc] bl ov37_02254B0C add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov37_022548E0 @@ -298,7 +298,7 @@ ov37_02254A54: ; 0x02254A54 add r6, r1, #0 mov r0, #8 mov r1, #0x48 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254A94 add r0, #8 @@ -391,7 +391,7 @@ ov37_02254B0C: ; 0x02254B0C beq _02254B1C bl ov37_02254AF4 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254B1C: pop {r4, pc} .align 2, 0 diff --git a/arm9/overlays/38/asm/overlay_38.s b/arm9/overlays/38/asm/overlay_38.s index ddad2b17f..c2e7dd145 100644 --- a/arm9/overlays/38/asm/overlay_38.s +++ b/arm9/overlays/38/asm/overlay_38.s @@ -12,7 +12,7 @@ ov38_02254854: ; 0x02254854 mov r1, #0x24 add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -32,7 +32,7 @@ ov38_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -127,7 +127,7 @@ ov38_02254928: ; 0x02254928 ldr r0, [r4, #0x14] bl ov38_02254D04 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov38_02254928 @@ -500,7 +500,7 @@ ov38_02254BC4: ; 0x02254BC4 add r6, r1, #0 mov r0, #8 mov r1, #0xc0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254C2A add r0, #8 @@ -671,7 +671,7 @@ ov38_02254D04: ; 0x02254D04 add r0, r4, #0 bl ov38_02254CC4 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254D32: pop {r4, pc} thumb_func_end ov38_02254D04 diff --git a/arm9/overlays/39/asm/overlay_39.s b/arm9/overlays/39/asm/overlay_39.s index e0ddc7748..43fb68ede 100644 --- a/arm9/overlays/39/asm/overlay_39.s +++ b/arm9/overlays/39/asm/overlay_39.s @@ -12,7 +12,7 @@ ov39_02254854: ; 0x02254854 mov r1, #0x68 add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -32,7 +32,7 @@ ov39_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -154,7 +154,7 @@ ov39_02254974: ; 0x02254974 ldr r0, [r4, #0x38] bl ov39_02254C58 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov39_02254974 @@ -534,7 +534,7 @@ ov39_02254C1C: ; 0x02254C1C add r5, r1, #0 mov r0, #8 mov r1, #0x88 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254C52 add r0, #8 @@ -564,7 +564,7 @@ ov39_02254C58: ; 0x02254C58 beq _02254C68 bl ov39_02254D78 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254C68: pop {r4, pc} .align 2, 0 diff --git a/arm9/overlays/40/asm/overlay_40.s b/arm9/overlays/40/asm/overlay_40.s index e14eefdc2..1a944ac22 100644 --- a/arm9/overlays/40/asm/overlay_40.s +++ b/arm9/overlays/40/asm/overlay_40.s @@ -12,7 +12,7 @@ ov40_02254854: ; 0x02254854 mov r1, #0x34 add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -32,7 +32,7 @@ ov40_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -155,7 +155,7 @@ ov40_02254978: ; 0x02254978 ldr r0, [r4, #8] bl ov40_02254DA8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov40_02254978 @@ -709,7 +709,7 @@ ov40_02254D6C: ; 0x02254D6C add r5, r1, #0 mov r0, #8 mov r1, #0x9c - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254DA2 add r0, #8 @@ -739,7 +739,7 @@ ov40_02254DA8: ; 0x02254DA8 beq _02254DB8 bl ov40_02254EE4 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254DB8: pop {r4, pc} .align 2, 0 diff --git a/arm9/overlays/41/asm/overlay_41.s b/arm9/overlays/41/asm/overlay_41.s index 848a8c9a1..b5dd65466 100644 --- a/arm9/overlays/41/asm/overlay_41.s +++ b/arm9/overlays/41/asm/overlay_41.s @@ -12,7 +12,7 @@ ov41_02254854: ; 0x02254854 mov r1, #0x90 add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -32,7 +32,7 @@ ov41_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -272,7 +272,7 @@ ov41_02254A38: ; 0x02254A38 ldr r0, [r4, #8] bl ov41_0225528C add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov41_02254A38 @@ -1330,7 +1330,7 @@ ov41_0225524C: ; 0x0225524C add r5, r1, #0 mov r0, #8 mov r1, #0xac - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02255288 add r0, #8 @@ -1362,7 +1362,7 @@ ov41_0225528C: ; 0x0225528C beq _0225529C bl ov41_02255374 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _0225529C: pop {r4, pc} .align 2, 0 diff --git a/arm9/overlays/42/asm/overlay_42.s b/arm9/overlays/42/asm/overlay_42.s index f2b6d36d3..9b14ec54e 100644 --- a/arm9/overlays/42/asm/overlay_42.s +++ b/arm9/overlays/42/asm/overlay_42.s @@ -12,7 +12,7 @@ ov42_02254854: ; 0x02254854 mov r1, #0x78 add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -32,7 +32,7 @@ ov42_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -213,7 +213,7 @@ _022549D4: ldr r0, [r6, #0x58] bl ov42_02254CF0 add r0, r6, #0 - bl FreeToHeap + bl Heap_Free pop {r4, r5, r6, pc} .align 2, 0 thumb_func_end ov42_022549CC @@ -609,7 +609,7 @@ ov42_02254CB4: ; 0x02254CB4 add r5, r1, #0 mov r0, #8 mov r1, #0x74 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254CEA add r0, #8 @@ -639,7 +639,7 @@ ov42_02254CF0: ; 0x02254CF0 beq _02254D00 bl ov42_02254E7C add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254D00: pop {r4, pc} .align 2, 0 diff --git a/arm9/overlays/43/asm/overlay_43.s b/arm9/overlays/43/asm/overlay_43.s index df4105c53..9415d9d5f 100644 --- a/arm9/overlays/43/asm/overlay_43.s +++ b/arm9/overlays/43/asm/overlay_43.s @@ -12,7 +12,7 @@ ov43_02254854: ; 0x02254854 mov r1, #0xb0 add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -32,7 +32,7 @@ ov43_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -118,7 +118,7 @@ ov43_02254928: ; 0x02254928 ldr r0, [r0] bl ov43_02254BCC add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov43_02254928 @@ -461,7 +461,7 @@ ov43_02254B8C: ; 0x02254B8C add r6, r0, #0 mov r0, #8 lsl r1, r1, #4 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254BC6 add r0, #8 @@ -491,7 +491,7 @@ ov43_02254BCC: ; 0x02254BCC push {r3, lr} cmp r0, #0 beq _02254BD6 - bl FreeToHeap + bl Heap_Free _02254BD6: pop {r3, pc} thumb_func_end ov43_02254BCC diff --git a/arm9/overlays/44/asm/ov44_02254854.s b/arm9/overlays/44/asm/ov44_02254854.s index ba449374d..39d60b011 100644 --- a/arm9/overlays/44/asm/ov44_02254854.s +++ b/arm9/overlays/44/asm/ov44_02254854.s @@ -12,7 +12,7 @@ ov44_02254854: ; 0x02254854 mov r1, #0x14 add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -32,7 +32,7 @@ ov44_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -79,7 +79,7 @@ ov44_022548D8: ; 0x022548D8 ldr r0, [r4, #8] bl ov44_02254B00 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov44_022548D8 diff --git a/arm9/overlays/44/asm/ov44_02254A54.s b/arm9/overlays/44/asm/ov44_02254A54.s index 42d1a1aa7..45c97a9ec 100644 --- a/arm9/overlays/44/asm/ov44_02254A54.s +++ b/arm9/overlays/44/asm/ov44_02254A54.s @@ -10,7 +10,7 @@ ov44_02254A54: ; 0x02254A54 add r5, r1, #0 mov r0, #8 mov r1, #0x3c - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254A8A add r0, #8 @@ -99,7 +99,7 @@ ov44_02254B00: ; 0x02254B00 beq _02254B10 bl ov44_02254AE4 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254B10: pop {r4, pc} .align 2, 0 diff --git a/arm9/overlays/45/asm/overlay_45.s b/arm9/overlays/45/asm/overlay_45.s index a40e49f4f..05e510961 100644 --- a/arm9/overlays/45/asm/overlay_45.s +++ b/arm9/overlays/45/asm/overlay_45.s @@ -12,7 +12,7 @@ ov45_02254854: ; 0x02254854 mov r1, #0xb0 add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -32,7 +32,7 @@ ov45_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -200,7 +200,7 @@ ov45_022549C0: ; 0x022549C0 ldr r0, [r0] bl ov45_02254BCC add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov45_022549C0 @@ -455,7 +455,7 @@ ov45_02254B90: ; 0x02254B90 add r5, r1, #0 mov r0, #8 mov r1, #0x3c - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254BC6 add r0, #8 @@ -485,7 +485,7 @@ ov45_02254BCC: ; 0x02254BCC beq _02254BDC bl ov45_02254C64 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254BDC: pop {r4, pc} .align 2, 0 diff --git a/arm9/overlays/46/asm/ov46_02254854.s b/arm9/overlays/46/asm/ov46_02254854.s index 8a73ae5a7..1fa64a77e 100644 --- a/arm9/overlays/46/asm/ov46_02254854.s +++ b/arm9/overlays/46/asm/ov46_02254854.s @@ -12,7 +12,7 @@ ov46_02254854: ; 0x02254854 mov r1, #0x10 add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -32,7 +32,7 @@ ov46_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -69,7 +69,7 @@ ov46_022548C0: ; 0x022548C0 ldr r0, [r4, #8] bl ov46_022549DC add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov46_022548C0 diff --git a/arm9/overlays/46/asm/ov46_022549AC.s b/arm9/overlays/46/asm/ov46_022549AC.s index fdc7b98a4..0b4657208 100644 --- a/arm9/overlays/46/asm/ov46_022549AC.s +++ b/arm9/overlays/46/asm/ov46_022549AC.s @@ -10,7 +10,7 @@ ov46_022549AC: ; 0x022549AC add r6, r1, #0 mov r0, #8 mov r1, #0x30 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _022549D8 add r0, #8 @@ -34,7 +34,7 @@ ov46_022549DC: ; 0x022549DC push {r3, lr} cmp r0, #0 beq _022549E6 - bl FreeToHeap + bl Heap_Free _022549E6: pop {r3, pc} thumb_func_end ov46_022549DC diff --git a/arm9/overlays/47/asm/overlay_47.s b/arm9/overlays/47/asm/overlay_47.s index d676f35a1..581e739fe 100644 --- a/arm9/overlays/47/asm/overlay_47.s +++ b/arm9/overlays/47/asm/overlay_47.s @@ -12,7 +12,7 @@ ov47_02254854: ; 0x02254854 mov r1, #0x24 add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -32,7 +32,7 @@ ov47_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -75,7 +75,7 @@ ov47_022548CC: ; 0x022548CC ldr r0, [r4, #0x14] bl ov47_02254D6C add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov47_022548CC @@ -685,7 +685,7 @@ ov47_02254D14: ; 0x02254D14 add r5, r1, #0 mov r0, #8 mov r1, #0x60 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254D62 add r0, #8 @@ -731,7 +731,7 @@ ov47_02254D6C: ; 0x02254D6C add r0, r4, #0 bl ov47_02254DFC add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254D8A: pop {r4, pc} thumb_func_end ov47_02254D6C diff --git a/arm9/overlays/48/asm/overlay_48.s b/arm9/overlays/48/asm/overlay_48.s index 70d6fa8f2..7b5b1a069 100644 --- a/arm9/overlays/48/asm/overlay_48.s +++ b/arm9/overlays/48/asm/overlay_48.s @@ -12,7 +12,7 @@ ov48_02254854: ; 0x02254854 mov r1, #0x40 add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -32,7 +32,7 @@ ov48_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -126,7 +126,7 @@ ov48_02254938: ; 0x02254938 ldr r0, [r4, #0x2c] bl ov48_02254AD4 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov48_02254938 @@ -331,7 +331,7 @@ ov48_02254AA0: ; 0x02254AA0 add r6, r1, #0 mov r0, #8 mov r1, #0xb0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254ACE add r0, #8 @@ -356,7 +356,7 @@ ov48_02254AD4: ; 0x02254AD4 push {r3, lr} cmp r0, #0 beq _02254ADE - bl FreeToHeap + bl Heap_Free _02254ADE: pop {r3, pc} thumb_func_end ov48_02254AD4 diff --git a/arm9/overlays/49/asm/overlay_49.s b/arm9/overlays/49/asm/overlay_49.s index 953cca613..0528adb16 100644 --- a/arm9/overlays/49/asm/overlay_49.s +++ b/arm9/overlays/49/asm/overlay_49.s @@ -12,7 +12,7 @@ ov49_02254854: ; 0x02254854 mov r1, #0x7c add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -32,7 +32,7 @@ ov49_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -116,7 +116,7 @@ ov49_02254920: ; 0x02254920 ldr r0, [r4, #0x68] bl ov49_02254A78 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov49_02254920 @@ -289,7 +289,7 @@ ov49_02254A44: ; 0x02254A44 add r6, r1, #0 mov r0, #8 mov r1, #0x98 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254A72 add r0, #8 @@ -314,7 +314,7 @@ ov49_02254A78: ; 0x02254A78 push {r3, lr} cmp r0, #0 beq _02254A82 - bl FreeToHeap + bl Heap_Free _02254A82: pop {r3, pc} thumb_func_end ov49_02254A78 diff --git a/arm9/overlays/50/asm/ov50_02254854.s b/arm9/overlays/50/asm/ov50_02254854.s index 3fa283585..ea5059695 100644 --- a/arm9/overlays/50/asm/ov50_02254854.s +++ b/arm9/overlays/50/asm/ov50_02254854.s @@ -12,7 +12,7 @@ ov50_02254854: ; 0x02254854 mov r1, #0x10 str r2, [sp] add r5, r3, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02254894 ldr r2, [sp] @@ -33,7 +33,7 @@ ov50_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488E: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02254894: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -70,7 +70,7 @@ ov50_022548C0: ; 0x022548C0 ldr r0, [r4, #8] bl ov50_022549E0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov50_022548C0 diff --git a/arm9/overlays/50/asm/ov50_022549AC.s b/arm9/overlays/50/asm/ov50_022549AC.s index 6727ab553..9d17229ec 100644 --- a/arm9/overlays/50/asm/ov50_022549AC.s +++ b/arm9/overlays/50/asm/ov50_022549AC.s @@ -10,7 +10,7 @@ ov50_022549AC: ; 0x022549AC add r6, r1, #0 mov r0, #8 mov r1, #0x30 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _022549DA add r0, #8 @@ -39,10 +39,10 @@ ov50_022549E0: ; 0x022549E0 ldr r0, [r4, #4] cmp r0, #0 beq _022549F0 - bl FreeToHeap + bl Heap_Free _022549F0: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _022549F6: pop {r4, pc} thumb_func_end ov50_022549E0 diff --git a/arm9/overlays/51/asm/overlay_51.s b/arm9/overlays/51/asm/overlay_51.s index 6397aa03a..b15dbb477 100644 --- a/arm9/overlays/51/asm/overlay_51.s +++ b/arm9/overlays/51/asm/overlay_51.s @@ -355,7 +355,7 @@ _02254AEC: ldr r0, [sp] bl ov51_02254B30 ldr r0, [r6, #0x20] - bl FreeToHeap + bl Heap_Free mov r0, #0xa2 lsl r0, r0, #2 ldr r0, [r6, r0] @@ -1884,7 +1884,7 @@ _022556E6: bl ov51_02255640 _0225570E: ldr r0, [sp, #4] - bl FreeToHeap + bl Heap_Free _02255714: add sp, #8 pop {r3, r4, r5, r6, r7, pc} diff --git a/arm9/overlays/52/include/overlay_52.h b/arm9/overlays/52/include/overlay_52.h index aeccf6d63..33826950a 100644 --- a/arm9/overlays/52/include/overlay_52.h +++ b/arm9/overlays/52/include/overlay_52.h @@ -31,7 +31,7 @@ BOOL ov52_021D757C(struct OverlayManager *arg1, u32 *status); BOOL ov52_021D7594(struct OverlayManager *param0, u32 *status); BOOL ov52_021D75E8(struct OverlayManager *arg1, u32 *status); -void ov52_021D7604(HeapID heapId, struct SaveData *save, BOOL set_trainerid); +void ov52_021D7604(enum HeapID heapID, struct SaveData *save, BOOL set_trainerid); void ov52_021D7688(u32 param0, struct SaveData *save); void ov52_021D769C(u32 param0, struct SaveData *save); diff --git a/arm9/overlays/52/src/overlay_52.c b/arm9/overlays/52/src/overlay_52.c index 50eb21791..581aea9e0 100644 --- a/arm9/overlays/52/src/overlay_52.c +++ b/arm9/overlays/52/src/overlay_52.c @@ -11,7 +11,7 @@ extern struct OverlayManagerTemplate UNK_020F2B7C; extern struct OverlayManagerTemplate UNK_020F2B8C; extern int sub_02053678(u32 random, u32 gender, u32 param2); -extern void sub_020250C4(void *sav_ptr, HeapID heapId, const u16 param2[], u32 param3); +extern void sub_020250C4(void *sav_ptr, enum HeapID heapID, const u16 param2[], u32 param3); extern void sub_020377E0(struct SaveData *save); extern void sub_0205ECD4(struct SaveVarsFlags *script_state); @@ -278,7 +278,7 @@ const u16 ov52_021D76F8[] = { BOOL ov52_021D74E0(struct OverlayManager *manager, u32 *status) { #pragma unused(manager) #pragma unused(status) - CreateHeap(3, 0x4d, 0x20000); + Heap_Create(HEAP_ID_MAIN, HEAP_ID_77, 0x20000); InitializeMainRNG(); return TRUE; @@ -296,7 +296,7 @@ BOOL ov52_021D74F8(struct OverlayManager *manager, u32 *status) { BOOL ov52_021D750C(struct OverlayManager *manager, u32 *status) { #pragma unused(manager) #pragma unused(status) - DestroyHeap(HEAP_ID_77); + Heap_Destroy(HEAP_ID_77); RegisterMainOverlay(SDK_OVERLAY_INVALID_ID, &UNK_020FD144); return TRUE; @@ -305,7 +305,7 @@ BOOL ov52_021D750C(struct OverlayManager *manager, u32 *status) { BOOL ov52_021D7528(struct OverlayManager *manager, u32 *status) { #pragma unused(manager) #pragma unused(status) - CreateHeap(3, 0x4d, 0x20000); + Heap_Create(HEAP_ID_MAIN, HEAP_ID_77, 0x20000); InitializeMainRNG(); return TRUE; @@ -325,7 +325,7 @@ BOOL ov52_021D7540(struct OverlayManager *manager, u32 *status) { BOOL ov52_021D7560(struct OverlayManager *manager, u32 *status) { #pragma unused(manager) #pragma unused(status) - DestroyHeap(HEAP_ID_77); + Heap_Destroy(HEAP_ID_77); RegisterMainOverlay(SDK_OVERLAY_INVALID_ID, &UNK_020F2B7C); return TRUE; @@ -334,7 +334,7 @@ BOOL ov52_021D7560(struct OverlayManager *manager, u32 *status) { BOOL ov52_021D757C(struct OverlayManager *manager, u32 *status) { #pragma unused(manager) #pragma unused(status) - CreateHeap(3, 0x4d, 0x20000); + Heap_Create(HEAP_ID_MAIN, HEAP_ID_77, 0x20000); InitializeMainRNG(); return TRUE; @@ -362,13 +362,13 @@ BOOL ov52_021D7594(struct OverlayManager *manager, u32 *status) { BOOL ov52_021D75E8(struct OverlayManager *manager, u32 *status) { #pragma unused(manager) #pragma unused(status) - DestroyHeap(HEAP_ID_77); + Heap_Destroy(HEAP_ID_77); RegisterMainOverlay(SDK_OVERLAY_INVALID_ID, &UNK_020F2B8C); return 1; } -void ov52_021D7604(HeapID heapId, struct SaveData *save, BOOL set_trainerid) { +void ov52_021D7604(enum HeapID heapID, struct SaveData *save, BOOL set_trainerid) { Save_SysInfo_InitFromSystem(Save_SysInfo_Get(save)); Save_SysInfo_RTC_Init(Save_SysInfo_RTC_Get(save)); @@ -389,7 +389,7 @@ void ov52_021D7604(HeapID heapId, struct SaveData *save, BOOL set_trainerid) { PlayerProfile_SetAvatar(playerProfile, (u8)avatar); - sub_020250C4(sub_02024ECC(save), heapId, ov52_021D76F8, NELEMS(ov52_021D76F8) / 2); + sub_020250C4(sub_02024ECC(save), heapID, ov52_021D76F8, NELEMS(ov52_021D76F8) / 2); } void ov52_021D7688(u32 unused, struct SaveData *save) { diff --git a/arm9/overlays/53/asm/overlay_53.s b/arm9/overlays/53/asm/overlay_53.s index 28c0ca275..a5ba1bbef 100644 --- a/arm9/overlays/53/asm/overlay_53.s +++ b/arm9/overlays/53/asm/overlay_53.s @@ -37,7 +37,7 @@ _021D74F6: mov r0, #3 mov r1, #0x27 lsl r2, r2, #6 - bl CreateHeap + bl Heap_Create ldr r1, _021D7640 ; =0x0000940C add r0, r6, #0 mov r2, #0x27 @@ -410,14 +410,14 @@ _021D786E: add r0, r6, #0 bl ov53_021D7AE8 ldr r0, [r6, #8] - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0 add r1, r0, #0 bl Main_SetVBlankIntrCB mov r0, #0x27 - bl DestroyHeap + bl Heap_Destroy mov r0, #2 bl sub_02032B6C mov r0, #1 @@ -675,7 +675,7 @@ _021D7A0E: mov r1, #0xf mov r0, #0x27 lsl r1, r1, #0xa - bl AllocFromHeap + bl Heap_Alloc ldr r1, _021D7AE0 ; =0x000043C8 str r0, [r7, r1] mov r0, #0x27 @@ -704,7 +704,7 @@ ov53_021D7AE8: ; 0x021D7AE8 add r6, r0, #0 ldr r0, _021D7B1C ; =0x000043C8 ldr r0, [r6, r0] - bl FreeToHeap + bl Heap_Free ldr r0, _021D7B20 ; =0x000093F0 ldr r0, [r6, r0] bl sub_020145A8 @@ -749,7 +749,7 @@ ov53_021D7B24: ; 0x021D7B24 mov r1, #0 bl FreeBgTilemapBuffer add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov53_021D7B24 diff --git a/arm9/overlays/54/asm/overlay_54.s b/arm9/overlays/54/asm/overlay_54.s index 53bd43f3f..39a95ef62 100644 --- a/arm9/overlays/54/asm/overlay_54.s +++ b/arm9/overlays/54/asm/overlay_54.s @@ -38,7 +38,7 @@ _021D74F6: mov r0, #3 mov r1, #0x33 lsl r2, r2, #0xc - bl CreateHeap + bl Heap_Create ldr r1, _021D7638 ; =0x00004A60 add r0, r6, #0 mov r2, #0x33 @@ -333,7 +333,7 @@ _021D776C: add r1, r0, #0 bl Main_SetVBlankIntrCB mov r0, #0x33 - bl DestroyHeap + bl Heap_Destroy mov r0, #1 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -634,11 +634,11 @@ ov54_021D7A34: ; 0x021D7A34 add r6, r0, #0 bl ov54_021D8F0C ldr r0, [r6, #0x18] - bl FreeToHeap + bl Heap_Free mov r0, #0xea lsl r0, r0, #2 ldr r0, [r6, r0] - bl FreeToHeap + bl Heap_Free mov r4, #0 add r5, r6, #0 _021D7A50: @@ -674,7 +674,7 @@ ov54_021D7A6C: ; 0x021D7A6C mov r1, #0 bl FreeBgTilemapBuffer add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov54_021D7A6C @@ -3320,19 +3320,19 @@ ov54_021D8F0C: ; 0x021D8F0C mov r0, #0xcd lsl r0, r0, #2 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free mov r0, #0xce lsl r0, r0, #2 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free mov r0, #0xc9 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free mov r0, #0xca lsl r0, r0, #2 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov54_021D8F0C @@ -3777,7 +3777,7 @@ ov54_021D9238: ; 0x021D9238 add r5, r0, #0 add r0, r1, #0 add r1, r4, #0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r7, r0, #0 add r0, r5, #0 bl Save_SafariZone_Get @@ -3807,7 +3807,7 @@ ov54_021D9274: ; 0x021D9274 add r5, r0, #0 add r0, r1, #0 add r1, r4, #0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r7, r0, #0 add r0, r5, #0 bl Save_SafariZone_Get @@ -3835,7 +3835,7 @@ ov54_021D92AC: ; 0x021D92AC add r5, r0, #0 add r0, r1, #0 add r1, r4, #0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r7, r0, #0 add r0, r5, #0 bl Save_SafariZone_Get @@ -4069,7 +4069,7 @@ ov54_021D943C: ; 0x021D943C add r6, r0, #0 add r0, r4, #0 add r1, r5, #0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0 add r0, r6, #0 bl ov54_021D9098 @@ -4111,7 +4111,7 @@ ov54_021D9488: ; 0x021D9488 add r6, r0, #0 add r0, r4, #0 add r1, r5, #0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0 add r0, r6, #0 mov r1, #0 @@ -4217,7 +4217,7 @@ ov54_021D9544: ; 0x021D9544 add r6, r0, #0 add r0, r1, #0 add r1, r5, #0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0 mov r1, #0 add r2, r5, #0 @@ -4267,7 +4267,7 @@ _021D959C: add r2, r4, #0 bl MIi_CpuCopyFast add r0, r7, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [sp, #4] sub r6, r6, r4 add r0, r0, r4 diff --git a/arm9/overlays/55/asm/overlay_55.s b/arm9/overlays/55/asm/overlay_55.s index 8a691fc39..fcac991b8 100644 --- a/arm9/overlays/55/asm/overlay_55.s +++ b/arm9/overlays/55/asm/overlay_55.s @@ -89,7 +89,7 @@ _021D7580: mov r0, #3 mov r1, #0x34 lsl r2, r2, #0x12 - bl CreateHeap + bl Heap_Create ldr r1, _021D7610 ; =0x0000041C add r0, r6, #0 mov r2, #0x34 @@ -164,7 +164,7 @@ _021D7628: mov r0, #3 mov r1, #0x34 lsl r2, r2, #0x12 - bl CreateHeap + bl Heap_Create ldr r1, _021D76B8 ; =0x0000041C add r0, r6, #0 mov r2, #0x34 @@ -317,7 +317,7 @@ _021D7754: mov r0, #0xeb lsl r0, r0, #2 ldr r0, [r6, r0] - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov55_021D7720 @@ -349,7 +349,7 @@ ov55_021D77AC: ; 0x021D77AC add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0x34 - bl DestroyHeap + bl Heap_Destroy mov r0, #1 pop {r3, r4, r5, pc} thumb_func_end ov55_021D77AC @@ -708,7 +708,7 @@ ov55_021D7AA4: ; 0x021D7AA4 mov r1, #0 bl FreeBgTilemapBuffer add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov55_021D7AA4 @@ -1995,7 +1995,7 @@ ov55_021D84C8: ; 0x021D84C8 mov r1, #0x19 bl ov55_021DA0A4 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #0x3b mov r1, #0xd lsl r0, r0, #4 @@ -3335,7 +3335,7 @@ _021D8F1A: mov r1, #0xc bl ov55_021DA0A4 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, _021D8FE0 ; =0x00000418 mov r1, #0 strh r1, [r5, r0] @@ -3535,7 +3535,7 @@ ov55_021D90D8: ; 0x021D90D8 lsl r0, r0, #2 strb r1, [r5, r0] add r0, r6, #0 - bl FreeToHeap + bl Heap_Free _021D9170: mov r0, #0x3b mov r1, #3 @@ -4419,7 +4419,7 @@ _021D987C: add r2, r5, #0 bl BufferPlayersName add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r2, r4, #0 add r2, #0xb8 ldr r0, [r4, #0x10] @@ -4777,7 +4777,7 @@ _021D9C18: add r0, r4, r0 bl ScheduleWindowCopyToVram ldr r0, [sp, #0x20] - bl FreeToHeap + bl Heap_Free mov r0, #0x3b mov r1, #0x15 lsl r0, r0, #4 @@ -5226,7 +5226,7 @@ ov55_021D9F8C: ; 0x021D9F8C mov r1, #0x1c bl ov55_021DA0A4 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #0x3b mov r1, #0x1c lsl r0, r0, #4 diff --git a/arm9/overlays/56/asm/overlay_56.s b/arm9/overlays/56/asm/overlay_56.s index 6011b35dd..6c7c72adb 100644 --- a/arm9/overlays/56/asm/overlay_56.s +++ b/arm9/overlays/56/asm/overlay_56.s @@ -340,14 +340,14 @@ _02212098: mov r0, #3 mov r1, #0x36 lsl r2, r2, #0x10 - bl CreateHeap + bl Heap_Create b _022120BE _022120B2: mov r2, #0xb mov r0, #3 mov r1, #0x36 lsl r2, r2, #0x10 - bl CreateHeap + bl Heap_Create _022120BE: mov r1, #0x3f add r0, r4, #0 @@ -564,7 +564,7 @@ _02212274: add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0x36 - bl DestroyHeap + bl Heap_Destroy mov r0, #1 pop {r4, r5, r6, pc} .align 2, 0 @@ -916,7 +916,7 @@ ov56_02212540: ; 0x02212540 mov r1, #0 bl FreeBgTilemapBuffer add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov56_02212540 @@ -7113,7 +7113,7 @@ _02215532: add r2, r6, #0 bl BufferPlayersName add r0, r6, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 mov r2, #0x56 add r0, #0xcc @@ -8445,7 +8445,7 @@ ov56_022160E4: ; 0x022160E4 add r2, r4, #0 bl BufferPlayersName add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _0221611C: pop {r4, r5, r6, pc} .align 2, 0 diff --git a/arm9/overlays/57/asm/overlay_57.s b/arm9/overlays/57/asm/overlay_57.s index df7a2692c..763a72646 100644 --- a/arm9/overlays/57/asm/overlay_57.s +++ b/arm9/overlays/57/asm/overlay_57.s @@ -33,7 +33,7 @@ ov57_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x19 lsl r2, r2, #0xe - bl CreateHeap + bl Heap_Create ldr r1, _021D76F0 ; =0x00003320 add r0, r5, #0 mov r2, #0x19 @@ -546,10 +546,10 @@ ov57_021D7944: ; 0x021D7944 bl ov57_021D94BC ldr r0, _021D79A4 ; =0x000030B8 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free ldr r0, _021D79A8 ; =0x000032F8 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free add r0, r4, #4 bl ov57_021D89D4 ldr r0, [r4] @@ -561,7 +561,7 @@ ov57_021D7944: ; 0x021D7944 add r1, r0, #0 bl Main_SetVBlankIntrCB mov r0, #0x19 - bl DestroyHeap + bl Heap_Destroy mov r0, #1 mov r1, #0x7f bl GF_SndPlayerSetPlayerVolume @@ -736,7 +736,7 @@ _021D7AC4: mov r2, #0x20 bl GXS_LoadBGPltt add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, pc} thumb_func_end ov57_021D7A34 @@ -788,7 +788,7 @@ _021D7B30: mov r2, #0x20 bl GXS_LoadBGPltt add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #4 pop {r3, r4, pc} thumb_func_end ov57_021D7AF4 @@ -815,7 +815,7 @@ ov57_021D7B5C: ; 0x021D7B5C mov r2, #0x20 bl GXS_LoadBGPltt add r0, r6, #0 - bl FreeToHeap + bl Heap_Free add sp, #4 pop {r3, r4, r5, r6, pc} .align 2, 0 @@ -966,7 +966,7 @@ ov57_021D7CA4: ; 0x021D7CA4 lsl r2, r2, #8 bl GXS_LoadBGPltt add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 add r0, #0xb4 ldr r1, [r0] @@ -993,7 +993,7 @@ ov57_021D7CA4: ; 0x021D7CA4 lsl r2, r2, #8 bl GX_LoadBGPltt add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 add r0, #0xb4 ldr r0, [r0] @@ -1228,7 +1228,7 @@ ov57_021D7EDC: ; 0x021D7EDC mov r1, #3 bl FreeBgTilemapBuffer add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov57_021D7EDC @@ -3715,7 +3715,7 @@ _021D9290: mov r0, #0x1e lsl r0, r0, #4 ldr r0, [r5, r0] - bl FreeToHeap + bl Heap_Free bl GF_AssertFail b _021D92CE _021D92CA: @@ -3967,7 +3967,7 @@ _021D94C6: lsl r0, r4, #2 add r0, r5, r0 ldr r0, [r0, r6] - bl FreeToHeap + bl Heap_Free add r0, r4, #1 lsl r0, r0, #0x18 lsr r4, r0, #0x18 diff --git a/arm9/overlays/58/asm/overlay_58.s b/arm9/overlays/58/asm/overlay_58.s index dfa3010e3..cd708f461 100644 --- a/arm9/overlays/58/asm/overlay_58.s +++ b/arm9/overlays/58/asm/overlay_58.s @@ -43,7 +43,7 @@ _021D9A36: mov r0, #3 mov r1, #0x27 lsl r2, r2, #6 - bl CreateHeap + bl Heap_Create ldr r1, _021D9B74 ; =0x00005CB0 add r0, r6, #0 mov r2, #0x27 @@ -274,7 +274,7 @@ _021D9C40: add r1, r0, #0 bl Main_SetVBlankIntrCB mov r0, #0x27 - bl DestroyHeap + bl Heap_Destroy mov r0, #1 pop {r3, r4, r5, r6, r7, pc} nop @@ -561,7 +561,7 @@ ov58_021D9ED8: ; 0x021D9ED8 mov r1, #0 bl FreeBgTilemapBuffer add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov58_021D9ED8 diff --git a/arm9/overlays/59/include/ov59_Intro.h b/arm9/overlays/59/include/ov59_Intro.h index 70ed3b8b9..03a1f5326 100644 --- a/arm9/overlays/59/include/ov59_Intro.h +++ b/arm9/overlays/59/include/ov59_Intro.h @@ -19,7 +19,7 @@ struct ov59_UnkPlayerStruct { }; typedef struct ov59_IntroOverlayData { - HeapID heapId; + enum HeapID heapID; struct SaveData *save; struct Options *options; u32 controllerCounter; diff --git a/arm9/overlays/59/include/ov59_TV.h b/arm9/overlays/59/include/ov59_TV.h index 1125c3e1f..a2eadbaf4 100644 --- a/arm9/overlays/59/include/ov59_TV.h +++ b/arm9/overlays/59/include/ov59_TV.h @@ -8,7 +8,7 @@ #include "msgdata.h" typedef struct ov59_TVOverlayData2 { - HeapID heapId; + enum HeapID heapID; struct BgConfig *bgConfig; struct MsgData *msgData; u32 unk0C; diff --git a/arm9/overlays/59/src/ov59_Intro.c b/arm9/overlays/59/src/ov59_Intro.c index ae51c5714..30b4922f9 100644 --- a/arm9/overlays/59/src/ov59_Intro.c +++ b/arm9/overlays/59/src/ov59_Intro.c @@ -31,7 +31,7 @@ #include "unk_020051F4.h" #include "unk_02024E64.h" -extern void *sub_02077A84(HeapID heapId, u32 param1, u32 param2, u32 param3, struct Options *options); +extern void *sub_02077A84(enum HeapID heapID, u32 param1, u32 param2, u32 param3, struct Options *options); extern void sub_0200E3A0(PMLCDTarget, int); @@ -288,19 +288,19 @@ const u8 ov59_021D9FE8[0x64] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x40, 0x41, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x42, 0x43, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x44, 0x45, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x46, 0x47, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x48, 0x49, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x4A, 0x4B, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x4C, 0x4D, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 0x4E, 0x4F, 0x50, 0x51, 0x52, 0x53, 0x58, 0x59, 0x5A, 0x5B, 0x60, 0x61, 0x54, 0x55, 0x56, 0x57, 0x5C, 0x5D, 0x5E, 0x5F, 0x62, 0x63 }; -extern void BeginNormalPaletteFade(u32 pattern, u32 typeTop, u32 typeBottom, u16 colour, u32 duration, u32 framesPer, HeapID heapId); +extern void BeginNormalPaletteFade(u32 pattern, u32 typeTop, u32 typeBottom, u16 colour, u32 duration, u32 framesPer, enum HeapID heapID); extern BOOL IsPaletteFadeFinished(void); -extern u32 sub_020142EC(u32 param0, u32 param1, u32 param2, HeapID heapId); +extern u32 sub_020142EC(u32 param0, u32 param1, u32 param2, enum HeapID heapID); extern void sub_02077AC4(void *param0); extern void sub_020143D0(u32 param0); -extern u32 sub_02014590(HeapID heapId); +extern u32 sub_02014590(enum HeapID heapID); extern void sub_020145A8(u32 param0); -extern u32 *sub_0201244C(u16 param0, u16 param1, HeapID heapId); -extern u32 *sub_02012470(u16 param0, u16 param1, HeapID heapId); +extern u32 *sub_0201244C(u16 param0, u16 param1, enum HeapID heapID); +extern u32 *sub_02012470(u16 param0, u16 param1, enum HeapID heapID); extern const struct OverlayManagerTemplate UNK_020FA5FC; @@ -312,11 +312,11 @@ FS_EXTERN_OVERLAY(OVERLAY_52); BOOL ov59_IntroInit(struct OverlayManager *overlayManager, u32 *status) { #pragma unused(status) - CreateHeap(3, HEAP_ID_INTRO, 0x40000); + Heap_Create(HEAP_ID_MAIN, HEAP_ID_INTRO, 0x40000); ov59_IntroOverlayData *data = (ov59_IntroOverlayData *)OverlayManager_CreateAndGetData(overlayManager, sizeof(ov59_IntroOverlayData), HEAP_ID_INTRO); memset((void *)data, 0, sizeof(ov59_IntroOverlayData)); - data->heapId = HEAP_ID_INTRO; + data->heapID = HEAP_ID_INTRO; s32 *field18 = OverlayManager_GetField18(overlayManager); data->save = (struct SaveData *)field18[2]; //? data->options = Save_PlayerData_GetOptionsAddr(data->save); @@ -366,7 +366,7 @@ BOOL ov59_IntroMain(struct OverlayManager *overlayManager, u32 *status) { case 1: if (ov59_MasterController(data) == TRUE) { - BeginNormalPaletteFade(0, 0, 0, RGB_BLACK, 6, 1, data->heapId); + BeginNormalPaletteFade(0, 0, 0, RGB_BLACK, 6, 1, data->heapID); *status = 2; } @@ -374,7 +374,7 @@ BOOL ov59_IntroMain(struct OverlayManager *overlayManager, u32 *status) { break; } - BeginNormalPaletteFade(0, 0, 0, RGB_BLACK, 6, 1, data->heapId); + BeginNormalPaletteFade(0, 0, 0, RGB_BLACK, 6, 1, data->heapID); *status = 3; break; @@ -433,7 +433,7 @@ BOOL ov59_IntroExit(struct OverlayManager *overlayManager, u32 *status) { #pragma unused(status) ov59_IntroOverlayData *data = (ov59_IntroOverlayData *)OverlayManager_GetData(overlayManager); - HeapID heapId = data->heapId; + enum HeapID heapID = data->heapID; PlayerName_StringToFlat(Save_PlayerData_GetProfile(data->save), data->playerStruct->name); PlayerProfile_SetTrainerGender(Save_PlayerData_GetProfile(data->save), data->playerStruct->gender); @@ -443,7 +443,7 @@ BOOL ov59_IntroExit(struct OverlayManager *overlayManager, u32 *status) { sub_02077AC4(data->rivalStruct); OverlayManager_FreeData(overlayManager); - DestroyHeap(heapId); + Heap_Destroy(heapID); RegisterMainOverlay(FS_OVERLAY_ID(OVERLAY_52), &ov52_021D76D8); @@ -475,7 +475,7 @@ BOOL ov59_TestPokeballTouchLocation(void) { void ov59_IntroSetupBg(ov59_IntroOverlayData *data) { struct GraphicsBanks graphicsBanks = ov59_021D9F18; GfGfx_SetBanks(&graphicsBanks); - data->bgConfig = BgConfig_Alloc(data->heapId); + data->bgConfig = BgConfig_Alloc(data->heapID); struct GraphicsModes graphicsModes = ov59_021D9DCC; SetBothScreensModesAndDisable(&graphicsModes); @@ -501,10 +501,10 @@ void ov59_IntroSetupBg(ov59_IntroOverlayData *data) { InitBgFromTemplate(data->bgConfig, GF_BG_LYR_MAIN_3, &bgTemplateMain, GF_BG_TYPE_TEXT); BgClearTilemapBufferAndCommit(data->bgConfig, GF_BG_LYR_MAIN_3); - sub_0200CD68(data->bgConfig, 0, 994, 4, 0, data->heapId); - LoadUserFrameGfx1(data->bgConfig, GF_BG_LYR_MAIN_0, 985, 3, 0, data->heapId); - LoadFontPal0(GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_5_OFFSET, data->heapId); - LoadFontPal1(GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_6_OFFSET, data->heapId); + sub_0200CD68(data->bgConfig, 0, 994, 4, 0, data->heapID); + LoadUserFrameGfx1(data->bgConfig, GF_BG_LYR_MAIN_0, 985, 3, 0, data->heapID); + LoadFontPal0(GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_5_OFFSET, data->heapID); + LoadFontPal1(GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_6_OFFSET, data->heapID); struct BgTemplate bgTemplateSub = ov59_021D9EBC; bgTemplateSub.screenBase = GX_BG_SCRBASE_0x7800; @@ -562,17 +562,17 @@ void ov59_IntroDestroyBg(ov59_IntroOverlayData *data) { FreeBgTilemapBuffer(data->bgConfig, GF_BG_LYR_SUB_2); FreeBgTilemapBuffer(data->bgConfig, GF_BG_LYR_SUB_3); - FreeToHeap(data->bgConfig); + Heap_Free(data->bgConfig); } void ov59_IntroSetupMsg(ov59_IntroOverlayData *data) { - data->msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0341_bin, data->heapId); + data->msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0341_bin, data->heapID); ResetAllTextPrinters(); - data->unk60 = sub_020142EC(0, 0, 6, data->heapId); + data->unk60 = sub_020142EC(0, 0, 6, data->heapID); - data->messageFormat = MessageFormat_New(data->heapId); + data->messageFormat = MessageFormat_New(data->heapID); data->displayMessageCounter = 0; data->displayControlMessageCounter = 0; @@ -587,7 +587,7 @@ void ov59_IntroDestroyMsg(ov59_IntroOverlayData *data) { void ov59_021D7A4C(ov59_IntroOverlayData *data) // ov59_Setup... something? { - data->unk68 = sub_02014590(data->heapId); + data->unk68 = sub_02014590(data->heapID); } void ov59_021D7A5C(ov59_IntroOverlayData *data) // ov59_Destroy... something? @@ -709,8 +709,8 @@ BOOL ov59_DisplayMessage(ov59_IntroOverlayData *data, u32 msgNo, BOOL autoAdvanc TextFlags_SetCanABSpeedUpPrint(TRUE); sub_02002B7C(0); - struct String *string = String_New(1024, data->heapId); - data->string = String_New(1024, data->heapId); + struct String *string = String_New(1024, data->heapID); + data->string = String_New(1024, data->heapID); ReadMsgDataIntoString(data->msgData, msgNo, string); BufferString(data->messageFormat, 0, data->playerStruct->name, data->selectedGender, 1, 2); BufferString(data->messageFormat, 1, data->rivalStruct->name, 0, 1, 2); @@ -779,7 +779,7 @@ BOOL ov59_CreateListWithText(ov59_IntroOverlayData *data, u32 param1, u32 param2 break; } AddWindow(data->bgConfig, &data->listWindow, windowTemplate); - data->listMenuItem = ListMenuItems_New(menuItemsCount, data->heapId); + data->listMenuItem = ListMenuItems_New(menuItemsCount, data->heapID); for (i = 0; i < menuItemsCount; i++) { ListMenuItems_AppendFromMsgData(data->listMenuItem, data->msgData, listStruct[i].msgNo, listStruct[i].val); } @@ -789,7 +789,7 @@ BOOL ov59_CreateListWithText(ov59_IntroOverlayData *data, u32 param1, u32 param2 template.maxShowed = (u16)menuItemsCount; template.moveCursorFunc = ov59_PlaySelectSound; template.window = &data->listWindow; - data->listMenu = ListMenuInit(&template, 0, 0, data->heapId); + data->listMenu = ListMenuInit(&template, 0, 0, data->heapID); DrawFrameAndWindow1(template.window, TRUE, 985, 3); CopyWindowToVram(&data->listWindow); data->createListCounter = 1; @@ -815,7 +815,7 @@ BOOL ov59_DisplayControlAdventureMessage(ov59_IntroOverlayData *data, u32 msgNo, switch (data->displayControlMessageCounter) { case 0: ToggleBgLayer(GF_BG_LYR_MAIN_0, GX_PLANE_TOGGLE_OFF); - data->string = String_New(1024, data->heapId); + data->string = String_New(1024, data->heapID); ReadMsgDataIntoString(data->msgData, msgNo, data->string); struct WindowTemplate template; if (param2 == 1) { @@ -868,9 +868,9 @@ BOOL ov59_DisplayControlAdventureMessage(ov59_IntroOverlayData *data, u32 msgNo, } void ov59_LoadInitialTilemap(ov59_IntroOverlayData *data) { - GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, NARC_intro_main_background_tileset_NCGR, data->bgConfig, GF_BG_LYR_MAIN_3, 0, 0, FALSE, data->heapId); - BG_ClearCharDataRange(GF_BG_LYR_MAIN_0, 0x20, 0, data->heapId); - GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, NARC_intro_sub_background_tileset_NCGR, data->bgConfig, GF_BG_LYR_SUB_3, 0, 0, FALSE, data->heapId); + GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, NARC_intro_main_background_tileset_NCGR, data->bgConfig, GF_BG_LYR_MAIN_3, 0, 0, FALSE, data->heapID); + BG_ClearCharDataRange(GF_BG_LYR_MAIN_0, 0x20, 0, data->heapID); + GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, NARC_intro_sub_background_tileset_NCGR, data->bgConfig, GF_BG_LYR_SUB_3, 0, 0, FALSE, data->heapID); u32 mainPal; u32 subPal; @@ -881,8 +881,8 @@ void ov59_LoadInitialTilemap(ov59_IntroOverlayData *data) { mainPal = NARC_intro_main_background_pearl_NCLR; subPal = NARC_intro_sub_background_pearl_NCLR; } - GfGfxLoader_GXLoadPal(NARC_DEMO_INTRO_INTRO, mainPal, GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_0_OFFSET, 0x60, data->heapId); - GfGfxLoader_GXLoadPal(NARC_DEMO_INTRO_INTRO, subPal, GF_PAL_LOCATION_SUB_BG, GF_PAL_SLOT_0_OFFSET, 0xa0, data->heapId); + GfGfxLoader_GXLoadPal(NARC_DEMO_INTRO_INTRO, mainPal, GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_0_OFFSET, 0x60, data->heapID); + GfGfxLoader_GXLoadPal(NARC_DEMO_INTRO_INTRO, subPal, GF_PAL_LOCATION_SUB_BG, GF_PAL_SLOT_0_OFFSET, 0xa0, data->heapID); ov59_LoadMainScrnData(data); ov59_LoadCharDataFromIndex(data); ov59_LoadSubScrnData(data); @@ -895,21 +895,21 @@ void ov59_LoadMainScrnData(ov59_IntroOverlayData *data) { if (data->scrnDataIndexMain >= 5) { return; } - GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO, scrnData.scrnIds[data->scrnDataIndexMain], data->bgConfig, GF_BG_LYR_MAIN_3, 0, 0, FALSE, data->heapId); + GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO, scrnData.scrnIds[data->scrnDataIndexMain], data->bgConfig, GF_BG_LYR_MAIN_3, 0, 0, FALSE, data->heapID); } void ov59_LoadCharDataFromIndex(ov59_IntroOverlayData *data) { struct ov59_GraphicsPaletteMap021D9F90 graphicsPaletteMap = ov59_021D9F90; if (data->spriteDataIndex0 != 0 && data->spriteDataIndex0 < 12) { - GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, graphicsPaletteMap.map[data->spriteDataIndex0].charNum, data->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, FALSE, data->heapId); - GfGfxLoader_GXLoadPal(NARC_DEMO_INTRO_INTRO, graphicsPaletteMap.map[data->spriteDataIndex0].palNum, GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_7_OFFSET, 0x20, data->heapId); - GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO, NARC_intro_character_screen_NSCR, data->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, FALSE, data->heapId); + GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, graphicsPaletteMap.map[data->spriteDataIndex0].charNum, data->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, FALSE, data->heapID); + GfGfxLoader_GXLoadPal(NARC_DEMO_INTRO_INTRO, graphicsPaletteMap.map[data->spriteDataIndex0].palNum, GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_7_OFFSET, 0x20, data->heapID); + GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO, NARC_intro_character_screen_NSCR, data->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, FALSE, data->heapID); ov59_TilemapChangePalette(data, GF_BG_LYR_MAIN_1, 7); } if (data->spriteDataIndex1 != 0 && data->spriteDataIndex1 < 12) { - GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, graphicsPaletteMap.map[data->spriteDataIndex1].charNum, data->bgConfig, GF_BG_LYR_MAIN_2, 0, 0, FALSE, data->heapId); - GfGfxLoader_GXLoadPal(NARC_DEMO_INTRO_INTRO, graphicsPaletteMap.map[data->spriteDataIndex1].palNum, GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_8_OFFSET, 0x20, data->heapId); - GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO, NARC_intro_character_screen_NSCR, data->bgConfig, GF_BG_LYR_MAIN_2, 0, 0, FALSE, data->heapId); + GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, graphicsPaletteMap.map[data->spriteDataIndex1].charNum, data->bgConfig, GF_BG_LYR_MAIN_2, 0, 0, FALSE, data->heapID); + GfGfxLoader_GXLoadPal(NARC_DEMO_INTRO_INTRO, graphicsPaletteMap.map[data->spriteDataIndex1].palNum, GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_8_OFFSET, 0x20, data->heapID); + GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO, NARC_intro_character_screen_NSCR, data->bgConfig, GF_BG_LYR_MAIN_2, 0, 0, FALSE, data->heapID); ov59_TilemapChangePalette(data, GF_BG_LYR_MAIN_2, 8); } } @@ -919,7 +919,7 @@ void ov59_LoadSubScrnData(ov59_IntroOverlayData *data) { if (data->scrnDataIndexSub >= 5) { return; } - GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO, scrnData.scrnIds[data->scrnDataIndexSub], data->bgConfig, GF_BG_LYR_SUB_3, 0, 0, FALSE, data->heapId); + GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO, scrnData.scrnIds[data->scrnDataIndexSub], data->bgConfig, GF_BG_LYR_SUB_3, 0, 0, FALSE, data->heapID); if (data->scrnDataIndexSub == 1) { ov59_TilemapChangePalette(data, GF_BG_LYR_SUB_3, 3); } else if (data->scrnDataIndexSub == 2) { @@ -931,17 +931,17 @@ void ov59_LoadSubScrnData(ov59_IntroOverlayData *data) { void ov59_DrawMunchlax(ov59_IntroOverlayData *data) { struct SomeDrawPokemonStruct drawStruct; sub_02068C00(&drawStruct, SPECIES_MUNCHLAX, MON_MALE, 2, FALSE, 0, 0); - u16 *src = (u16 *)AllocFromHeap(data->heapId, 0x64 * sizeof(u16)); + u16 *src = (u16 *)Heap_Alloc(data->heapID, 0x64 * sizeof(u16)); for (s32 i = 0; i < 0x64; i++) { src[i] = ov59_021D9FE8[i] + 1; } - u32 *charData = sub_0201244C(drawStruct.unk0, drawStruct.unk2, data->heapId); - u32 *plttData = sub_02012470(drawStruct.unk0, drawStruct.unk4, data->heapId); + u32 *charData = sub_0201244C(drawStruct.unk0, drawStruct.unk2, data->heapID); + u32 *plttData = sub_02012470(drawStruct.unk0, drawStruct.unk4, data->heapID); FillBgTilemapRect(data->bgConfig, GF_BG_LYR_MAIN_2, 0, 0, 0, 32, 24, 9); LoadRectToBgTilemapRect(data->bgConfig, GF_BG_LYR_MAIN_2, src, 11, 11, 10, 10); ov59_TilemapChangePalette(data, GF_BG_LYR_MAIN_2, 9); - BG_ClearCharDataRange(GF_BG_LYR_MAIN_2, 32, 0, data->heapId); + BG_ClearCharDataRange(GF_BG_LYR_MAIN_2, 32, 0, data->heapID); BG_LoadCharTilesData(data->bgConfig, GF_BG_LYR_MAIN_2, charData, 0xc80, 1); BG_LoadPlttData(GF_BG_LYR_MAIN_2, plttData, 32, GF_PAL_SLOT_8_OFFSET); // r2 and r3 regswap BG_LoadPlttData(GF_BG_LYR_MAIN_2, ov59_021D9ED8, 32, GF_PAL_SLOT_9_OFFSET); @@ -949,13 +949,13 @@ void ov59_DrawMunchlax(ov59_IntroOverlayData *data) { FillBgTilemapRect(data->bgConfig, GF_BG_LYR_SUB_1, 0, 0, 0, 32, 24, 10); LoadRectToBgTilemapRect(data->bgConfig, GF_BG_LYR_SUB_1, src, 11, 7, 10, 10); ov59_TilemapChangePalette(data, GF_BG_LYR_SUB_1, 10); - BG_ClearCharDataRange(GF_BG_LYR_SUB_1, 32, 0, data->heapId); + BG_ClearCharDataRange(GF_BG_LYR_SUB_1, 32, 0, data->heapID); BG_LoadCharTilesData(data->bgConfig, GF_BG_LYR_SUB_1, charData, 0xc80, 1); BG_LoadPlttData(GF_BG_LYR_SUB_1, plttData, 32, GF_PAL_SLOT_10_OFFSET); BG_LoadPlttData(GF_BG_LYR_SUB_1, ov59_021D9ED8, 32, GF_PAL_SLOT_10_OFFSET); - FreeToHeap(plttData); - FreeToHeap(charData); - FreeToHeap(src); + Heap_Free(plttData); + Heap_Free(charData); + Heap_Free(src); } #else // clang-format off @@ -973,7 +973,7 @@ asm void ov59_DrawMunchlax(ov59_IntroOverlayData *data) { bl sub_02068C00 ldr r0, [r5, #0] mov r1, #0xc8 - bl AllocFromHeap + bl Heap_Alloc add r7, r0, #0 ldr r2, =ov59_021D9FE8 mov r1, #0 @@ -1099,11 +1099,11 @@ _021D82C8: lsl r3, r0, #6 bl BG_LoadPlttData add r0, r6, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r7, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} } @@ -1111,11 +1111,11 @@ _021D82C8: #endif void ov59_LoadPokeballButton(ov59_IntroOverlayData *data) { - GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO, NARC_intro_narc_0038_NSCR, data->bgConfig, GF_BG_LYR_SUB_2, 0, 0, FALSE, data->heapId); + GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO, NARC_intro_narc_0038_NSCR, data->bgConfig, GF_BG_LYR_SUB_2, 0, 0, FALSE, data->heapID); ov59_TilemapChangePalette(data, GF_BG_LYR_SUB_2, 9); - GfGfxLoader_GXLoadPal(NARC_DEMO_INTRO_INTRO, NARC_intro_narc_0039_NCLR, GF_PAL_LOCATION_SUB_BG, GF_PAL_SLOT_7_OFFSET, 0x60, data->heapId); - BG_ClearCharDataRange(GF_BG_LYR_SUB_2, 0x20, 0, data->heapId); - GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, NARC_intro_pokeball_button_1_NCGR, data->bgConfig, GF_BG_LYR_SUB_2, 0x20, 0, FALSE, data->heapId); + GfGfxLoader_GXLoadPal(NARC_DEMO_INTRO_INTRO, NARC_intro_narc_0039_NCLR, GF_PAL_LOCATION_SUB_BG, GF_PAL_SLOT_7_OFFSET, 0x60, data->heapID); + BG_ClearCharDataRange(GF_BG_LYR_SUB_2, 0x20, 0, data->heapID); + GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, NARC_intro_pokeball_button_1_NCGR, data->bgConfig, GF_BG_LYR_SUB_2, 0x20, 0, FALSE, data->heapID); } BOOL ov59_MoveSprite(ov59_IntroOverlayData *data, enum GFBgLayer layer, u32 param2) { @@ -1169,7 +1169,7 @@ void ov59_AnimatePlayerSprite(ov59_IntroOverlayData *data) { data->maleAnimTimer = timer; G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG2, GX_BLEND_PLANEMASK_BG3, 6, 10); struct ov59_CharStruct021D9DEC charStruct = ov59_021D9DEC; - GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, charStruct.narcId[data->maleAnimCounter], data->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, FALSE, data->heapId); + GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, charStruct.narcId[data->maleAnimCounter], data->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, FALSE, data->heapID); } else { if (data->femaleAnimTimer != 0) { timer = data->femaleAnimTimer - 1; @@ -1181,7 +1181,7 @@ void ov59_AnimatePlayerSprite(ov59_IntroOverlayData *data) { data->femaleAnimTimer = timer; G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG1, GX_BLEND_PLANEMASK_BG3, 6, 10); struct ov59_CharStruct021D9DEC charStruct = ov59_021D9DFC; - GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, charStruct.narcId[data->femaleAnimCounter], data->bgConfig, GF_BG_LYR_MAIN_2, 0, 0, FALSE, data->heapId); + GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, charStruct.narcId[data->femaleAnimCounter], data->bgConfig, GF_BG_LYR_MAIN_2, 0, 0, FALSE, data->heapID); } } @@ -1218,7 +1218,7 @@ BOOL ov59_PlayerShrinkAnimation(ov59_IntroOverlayData *data) { if (addr->charData[data->spriteDataIndex2] == 0xFF) { ret = TRUE; } else { - GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, addr->charData[data->spriteDataIndex2], data->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, FALSE, data->heapId); + GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, addr->charData[data->spriteDataIndex2], data->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, FALSE, data->heapID); } return ret; } @@ -1644,7 +1644,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data) { sub_02005350(SEQ_OPENING, 0); ToggleBgLayer(GF_BG_LYR_MAIN_0, GX_PLANE_TOGGLE_ON); ToggleBgLayer(GF_BG_LYR_SUB_3, GX_PLANE_TOGGLE_ON); - BeginNormalPaletteFade(0, 1, 1, RGB_BLACK, 6, 1, data->heapId); + BeginNormalPaletteFade(0, 1, 1, RGB_BLACK, 6, 1, data->heapID); data->controllerCounter = 1; break; @@ -1673,7 +1673,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data) { ov59_LoadCharDataFromIndex(data); ToggleBgLayer(GF_BG_LYR_MAIN_3, GX_PLANE_TOGGLE_ON); ToggleBgLayer(GF_BG_LYR_MAIN_1, GX_PLANE_TOGGLE_ON); - BeginNormalPaletteFade(3, 1, 1, RGB_BLACK, 16, 4, data->heapId); + BeginNormalPaletteFade(3, 1, 1, RGB_BLACK, 16, 4, data->heapID); data->controllerCounter = 4; break; @@ -1721,7 +1721,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data) { break; case 8: // fade to black - BeginNormalPaletteFade(0, 0, 0, RGB_BLACK, 6, 1, data->heapId); + BeginNormalPaletteFade(0, 0, 0, RGB_BLACK, 6, 1, data->heapID); data->controllerCounter = 9; break; @@ -1739,7 +1739,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data) { ov59_LoadMainScrnData(data); data->scrnDataIndexSub = 1; ov59_LoadSubScrnData(data); - BeginNormalPaletteFade(0, 1, 1, RGB_BLACK, 6, 1, data->heapId); + BeginNormalPaletteFade(0, 1, 1, RGB_BLACK, 6, 1, data->heapID); data->controllerCounter = 11; break; @@ -1857,7 +1857,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data) { break; } sub_020146C4(data->unk68); - BeginNormalPaletteFade(0, 0, 0, RGB_BLACK, 6, 1, data->heapId); + BeginNormalPaletteFade(0, 0, 0, RGB_BLACK, 6, 1, data->heapID); data->controllerCounter = 25; break; @@ -1896,7 +1896,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data) { ov59_LoadSubScrnData(data); ToggleBgLayer(GF_BG_LYR_MAIN_1, GX_PLANE_TOGGLE_ON); BgSetPosTextAndCommit(data->bgConfig, GF_BG_LYR_MAIN_1, BG_POS_OP_SET_X, 0); - BeginNormalPaletteFade(0, 1, 1, RGB_BLACK, 6, 1, data->heapId); + BeginNormalPaletteFade(0, 1, 1, RGB_BLACK, 6, 1, data->heapID); data->controllerCounter = 29; break; @@ -1919,7 +1919,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data) { ov59_LoadMainScrnData(data); data->scrnDataIndexSub = 2; ov59_LoadSubScrnData(data); - BeginNormalPaletteFade(0, 1, 1, RGB_BLACK, 6, 1, data->heapId); + BeginNormalPaletteFade(0, 1, 1, RGB_BLACK, 6, 1, data->heapID); data->controllerCounter = 32; break; @@ -1973,7 +1973,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data) { break; case 39: // fade to black - BeginNormalPaletteFade(0, 0, 0, RGB_BLACK, 6, 1, data->heapId); + BeginNormalPaletteFade(0, 0, 0, RGB_BLACK, 6, 1, data->heapID); data->controllerCounter = 40; break; @@ -2001,7 +2001,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data) { break; case 43: // fade to black - BeginNormalPaletteFade(4, 0, 0, RGB_BLACK, 6, 1, data->heapId); + BeginNormalPaletteFade(4, 0, 0, RGB_BLACK, 6, 1, data->heapID); data->controllerCounter = 44; break; @@ -2013,7 +2013,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data) { data->scrnDataIndexSub = 4; ov59_LoadSubScrnData(data); ToggleBgLayer(GF_BG_LYR_SUB_2, GX_PLANE_TOGGLE_ON); - BeginNormalPaletteFade(4, 1, 1, RGB_BLACK, 6, 1, data->heapId); + BeginNormalPaletteFade(4, 1, 1, RGB_BLACK, 6, 1, data->heapID); data->controllerCounter = 45; break; @@ -2063,7 +2063,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data) { PlaySE(SEQ_SE_DP_BOWA2); data->controllerCounter = 50; } else { - GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, arr2[data->spriteDataIndex2], data->bgConfig, GF_BG_LYR_SUB_2, 32, 0, FALSE, data->heapId); + GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, arr2[data->spriteDataIndex2], data->bgConfig, GF_BG_LYR_SUB_2, 32, 0, FALSE, data->heapID); data->spriteDataIndex2++; data->spriteData2Timer = 4; } @@ -2301,7 +2301,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data) { case 76: // load keyboard overlay (except this is not an overlay at all) data->playerStruct->gender = data->selectedGender; - data->loadedOverlay = OverlayManager_New(&UNK_020FA5FC, (s32 *)data->playerStruct, data->heapId); + data->loadedOverlay = OverlayManager_New(&UNK_020FA5FC, (s32 *)data->playerStruct, data->heapID); data->controllerCounter = 77; break; @@ -2316,7 +2316,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data) { ToggleBgLayer(GF_BG_LYR_MAIN_2, GX_PLANE_TOGGLE_ON); BgSetPosTextAndCommit(data->bgConfig, GF_BG_LYR_MAIN_2, BG_POS_OP_SET_X, 0); } - BeginNormalPaletteFade(0, 1, 1, RGB_BLACK, 6, 1, data->heapId); + BeginNormalPaletteFade(0, 1, 1, RGB_BLACK, 6, 1, data->heapID); data->controllerCounter = 78; break; @@ -2464,7 +2464,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data) { break; case 92: // load keyboard - data->loadedOverlay = OverlayManager_New(&UNK_020FA5FC, (s32 *)data->rivalStruct, data->heapId); + data->loadedOverlay = OverlayManager_New(&UNK_020FA5FC, (s32 *)data->rivalStruct, data->heapID); data->controllerCounter = 93; break; @@ -2474,7 +2474,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data) { ToggleBgLayer(GF_BG_LYR_SUB_3, GX_PLANE_TOGGLE_ON); ToggleBgLayer(GF_BG_LYR_MAIN_1, GX_PLANE_TOGGLE_ON); BgSetPosTextAndCommit(data->bgConfig, GF_BG_LYR_MAIN_1, BG_POS_OP_SET_X, 0); - BeginNormalPaletteFade(0, 1, 1, RGB_BLACK, 6, 1, data->heapId); + BeginNormalPaletteFade(0, 1, 1, RGB_BLACK, 6, 1, data->heapID); data->controllerCounter = 94; break; @@ -2597,7 +2597,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data) { break; case 108: // load overaly 59 TV - data->loadedOverlay = OverlayManager_New(&ov59_021D9DDC, 0, data->heapId); + data->loadedOverlay = OverlayManager_New(&ov59_021D9DDC, 0, data->heapID); data->controllerCounter = 109; break; diff --git a/arm9/overlays/59/src/ov59_TV.c b/arm9/overlays/59/src/ov59_TV.c index 19f6643a4..740c48d56 100644 --- a/arm9/overlays/59/src/ov59_TV.c +++ b/arm9/overlays/59/src/ov59_TV.c @@ -22,7 +22,7 @@ extern void sub_0200E3A0(PMLCDTarget, s32); -extern void BeginNormalPaletteFade(u32 pattern, u32 typeTop, u32 typeBottom, u16 colour, u32 duration, u32 framesPer, HeapID heapId); +extern void BeginNormalPaletteFade(u32 pattern, u32 typeTop, u32 typeBottom, u16 colour, u32 duration, u32 framesPer, enum HeapID heapID); extern BOOL IsPaletteFadeFinished(void); const struct WindowTemplate ov59_021DA04C = { @@ -125,10 +125,10 @@ const struct GraphicsBanks ov59_021DA0D4 = { BOOL ov59_TVInit(struct OverlayManager *overlayManager, u32 *status) { #pragma unused(status) - CreateHeap(3, HEAP_ID_INTRO_TV, 0x40000); + Heap_Create(HEAP_ID_MAIN, HEAP_ID_INTRO_TV, 0x40000); ov59_TVOverlayData *data = (ov59_TVOverlayData *)OverlayManager_CreateAndGetData(overlayManager, sizeof(ov59_TVOverlayData), HEAP_ID_INTRO_TV); memset((void *)data, 0, sizeof(ov59_TVOverlayData)); - data->heapId = HEAP_ID_INTRO_TV; + data->heapID = HEAP_ID_INTRO_TV; data->unk24 = 0; return TRUE; } @@ -186,7 +186,7 @@ BOOL ov59_TVMain(struct OverlayManager *overlayManager, u32 *status) { } data->unk24 = 0; //?? - BeginNormalPaletteFade(0, 1, 1, RGB_BLACK, 6, 1, data->heapId); + BeginNormalPaletteFade(0, 1, 1, RGB_BLACK, 6, 1, data->heapID); *status = 3; break; @@ -208,7 +208,7 @@ BOOL ov59_TVMain(struct OverlayManager *overlayManager, u32 *status) { break; } - BeginNormalPaletteFade(0, 0, 0, RGB_BLACK, 6, 1, data->heapId); + BeginNormalPaletteFade(0, 0, 0, RGB_BLACK, 6, 1, data->heapID); *status = 5; break; @@ -234,9 +234,9 @@ BOOL ov59_TVMain(struct OverlayManager *overlayManager, u32 *status) { BOOL ov59_TVExit(struct OverlayManager *overlayManager, u32 *status) { #pragma unused(status) - HeapID heapId = ((ov59_TVOverlayData *)OverlayManager_GetData(overlayManager))->heapId; + enum HeapID heapID = ((ov59_TVOverlayData *)OverlayManager_GetData(overlayManager))->heapID; OverlayManager_FreeData(overlayManager); - DestroyHeap(heapId); + Heap_Destroy(heapID); return TRUE; } @@ -248,7 +248,7 @@ void ov59_TVSetupGraphics(ov59_TVOverlayData *data) { const struct GraphicsBanks banks = ov59_021DA0D4; // sp #0x90 GfGfx_SetBanks(&banks); - data->bgConfig = BgConfig_Alloc(data->heapId); + data->bgConfig = BgConfig_Alloc(data->heapID); const struct GraphicsModes modes = ov59_021DA054; // sp #0x80 SetBothScreensModesAndDisable(&modes); @@ -256,30 +256,30 @@ void ov59_TVSetupGraphics(ov59_TVOverlayData *data) { const struct BgTemplate bgTemplateMain2 = ov59_021DA080; // sp #0x64 InitBgFromTemplate(data->bgConfig, GF_BG_LYR_MAIN_2, &bgTemplateMain2, GF_BG_TYPE_TEXT); - BG_ClearCharDataRange(GF_BG_LYR_MAIN_2, 0x20, 0, data->heapId); + BG_ClearCharDataRange(GF_BG_LYR_MAIN_2, 0x20, 0, data->heapID); BgClearTilemapBufferAndCommit(data->bgConfig, GF_BG_LYR_MAIN_2); const struct BgTemplate bgTemplateMain0 = ov59_021DA09C; // sp #0x48 InitBgFromTemplate(data->bgConfig, GF_BG_LYR_MAIN_0, &bgTemplateMain0, GF_BG_TYPE_TEXT); - GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO_TV, NARC_intro_tv_narc_0001_NCGR, data->bgConfig, GF_BG_LYR_MAIN_0, 0, 0, FALSE, data->heapId); - GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO_TV, NARC_intro_tv_narc_0004_NSCR, data->bgConfig, GF_BG_LYR_MAIN_0, 0, 0, FALSE, data->heapId); + GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO_TV, NARC_intro_tv_narc_0001_NCGR, data->bgConfig, GF_BG_LYR_MAIN_0, 0, 0, FALSE, data->heapID); + GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO_TV, NARC_intro_tv_narc_0004_NSCR, data->bgConfig, GF_BG_LYR_MAIN_0, 0, 0, FALSE, data->heapID); const struct BgTemplate bgTemplateMain1 = ov59_021DA064; // sp #0x2C InitBgFromTemplate(data->bgConfig, GF_BG_LYR_MAIN_1, &bgTemplateMain1, GF_BG_TYPE_TEXT); - GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO_TV, NARC_intro_tv_narc_0002_NCGR, data->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, FALSE, data->heapId); - GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO_TV, NARC_intro_tv_narc_0005_NSCR, data->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, FALSE, data->heapId); + GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO_TV, NARC_intro_tv_narc_0002_NCGR, data->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, FALSE, data->heapID); + GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO_TV, NARC_intro_tv_narc_0005_NSCR, data->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, FALSE, data->heapID); const struct BgTemplate bgTemplateMain3 = ov59_021DA0B8; // sp #0x10 InitBgFromTemplate(data->bgConfig, GF_BG_LYR_MAIN_3, &bgTemplateMain3, GF_BG_TYPE_TEXT); - GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO_TV, NARC_intro_tv_narc_0000_NCGR, data->bgConfig, GF_BG_LYR_MAIN_3, 0, 0, FALSE, data->heapId); - GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO_TV, NARC_intro_tv_narc_0003_NSCR, data->bgConfig, GF_BG_LYR_MAIN_3, 0, 0, FALSE, data->heapId); + GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO_TV, NARC_intro_tv_narc_0000_NCGR, data->bgConfig, GF_BG_LYR_MAIN_3, 0, 0, FALSE, data->heapID); + GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO_TV, NARC_intro_tv_narc_0003_NSCR, data->bgConfig, GF_BG_LYR_MAIN_3, 0, 0, FALSE, data->heapID); - GfGfxLoader_GXLoadPal(NARC_DEMO_INTRO_INTRO_TV, NARC_intro_tv_narc_0006_NCLR, GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_0_OFFSET, 0, data->heapId); + GfGfxLoader_GXLoadPal(NARC_DEMO_INTRO_INTRO_TV, NARC_intro_tv_narc_0006_NCLR, GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_0_OFFSET, 0, data->heapID); - LoadFontPal0(GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_1_OFFSET, data->heapId); + LoadFontPal0(GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_1_OFFSET, data->heapID); BG_SetMaskColor(GF_BG_LYR_MAIN_0, 0); BG_SetMaskColor(GF_BG_LYR_SUB_0, 0); @@ -303,11 +303,11 @@ void ov59_TVDestroyGraphics(ov59_TVOverlayData *data) { FreeBgTilemapBuffer(data->bgConfig, GF_BG_LYR_MAIN_1); FreeBgTilemapBuffer(data->bgConfig, GF_BG_LYR_MAIN_0); FreeBgTilemapBuffer(data->bgConfig, GF_BG_LYR_MAIN_2); - FreeToHeap(data->bgConfig); + Heap_Free(data->bgConfig); } void ov59_TVSetupMsg(ov59_TVOverlayData *data) { - data->msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0549_bin, data->heapId); + data->msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0549_bin, data->heapID); ResetAllTextPrinters(); @@ -323,7 +323,7 @@ BOOL ov59_021D9C74(ov59_TVOverlayData *data, u32 msgNo, u32 param2, u32 param3) switch (data->unk0C) { case 0: ToggleBgLayer(GF_BG_LYR_MAIN_2, GX_PLANE_TOGGLE_OFF); - struct String *string = String_New(1024, data->heapId); + struct String *string = String_New(1024, data->heapID); ReadMsgDataIntoString(data->msgData, msgNo, string); AddWindow(data->bgConfig, &data->window, &ov59_021DA04C); FillWindowPixelRect(&data->window, 0, 0, 0, 256, 192); diff --git a/arm9/overlays/60/asm/overlay_60.s b/arm9/overlays/60/asm/overlay_60.s index 8c5d2f4ef..efa7b344d 100644 --- a/arm9/overlays/60/asm/overlay_60.s +++ b/arm9/overlays/60/asm/overlay_60.s @@ -13,7 +13,7 @@ ov60_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x26 lsl r2, r2, #0x10 - bl CreateHeap + bl Heap_Create mov r1, #0xad add r0, r4, #0 lsl r1, r1, #2 @@ -215,7 +215,7 @@ _021D769A: add r0, r5, #0 bl OverlayManager_FreeData ldr r0, [r4] - bl DestroyHeap + bl Heap_Destroy mov r0, #1 pop {r3, r4, r5, pc} nop @@ -662,7 +662,7 @@ ov60_021D7A14: ; 0x021D7A14 mov r1, #0 bl FreeBgTilemapBuffer ldr r0, [r4, #0x14] - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov60_021D7A14 @@ -680,7 +680,7 @@ ov60_021D7A40: ; 0x021D7A40 bl GetNarcMemberSizeByIdPair add r1, r0, #0 ldr r0, [r5] - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r6, r0, #0 add r0, r4, #0 mov r1, #1 @@ -705,13 +705,13 @@ ov60_021D7A40: ; 0x021D7A40 mov r1, #4 bl BG_LoadCharTilesData add r0, r6, #0 - bl FreeToHeap + bl Heap_Free mov r0, #0x49 mov r1, #0 bl GetNarcMemberSizeByIdPair add r1, r0, #0 ldr r0, [r5] - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r6, r0, #0 add r0, r4, #0 mov r1, #0 @@ -733,13 +733,13 @@ ov60_021D7A40: ; 0x021D7A40 mov r3, #0 bl BG_LoadPlttData add r0, r6, #0 - bl FreeToHeap + bl Heap_Free mov r0, #0x49 mov r1, #2 bl GetNarcMemberSizeByIdPair add r1, r0, #0 ldr r0, [r5] - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x24] ldr r2, [r5, #0x24] add r0, r4, #0 @@ -817,11 +817,11 @@ ov60_021D7A40: ; 0x021D7A40 thumb_func_start ov60_021D7B98 ov60_021D7B98: ; 0x021D7B98 - ldr r3, _021D7BA0 ; =FreeToHeap + ldr r3, _021D7BA0 ; =Heap_Free ldr r0, [r0, #0x24] bx r3 nop -_021D7BA0: .word FreeToHeap +_021D7BA0: .word Heap_Free thumb_func_end ov60_021D7B98 thumb_func_start ov60_021D7BA4 diff --git a/arm9/overlays/61/asm/overlay_61.s b/arm9/overlays/61/asm/overlay_61.s index 5a38ecc1d..4cfffc7a6 100644 --- a/arm9/overlays/61/asm/overlay_61.s +++ b/arm9/overlays/61/asm/overlay_61.s @@ -12,7 +12,7 @@ ov61_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x29 lsl r2, r2, #0x10 - bl CreateHeap + bl Heap_Create add r0, r5, #0 mov r1, #0xbc mov r2, #0x29 @@ -80,7 +80,7 @@ ov61_021D7568: ; 0x021D7568 add r0, r5, #0 bl OverlayManager_FreeData add r0, r4, #0 - bl DestroyHeap + bl Heap_Destroy mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 @@ -1034,7 +1034,7 @@ ov61_021D7CB4: ; 0x021D7CB4 mov r1, #0 bl FreeBgTilemapBuffer ldr r0, [r4, #0x18] - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov61_021D7CB4 @@ -1079,7 +1079,7 @@ ov61_021D7CE8: ; 0x021D7CE8 bl GetNarcMemberSizeByIdPair add r1, r0, #0 ldr r0, [r5] - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r7, r0, #0 add r0, r6, #0 add r1, r4, #0 @@ -1105,13 +1105,13 @@ ov61_021D7CE8: ; 0x021D7CE8 mov r1, #4 bl BG_LoadCharTilesData add r0, r7, #0 - bl FreeToHeap + bl Heap_Free ldr r1, [sp, #0x1c] mov r0, #0x4f bl GetNarcMemberSizeByIdPair add r1, r0, #0 ldr r0, [r5] - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0 ldr r1, [sp, #0x1c] add r0, r6, #0 @@ -1238,13 +1238,13 @@ _021D7E00: ldr r0, [r5, #0x30] bl sub_0200372C add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r1, [sp, #0x20] mov r0, #0x4f bl GetNarcMemberSizeByIdPair add r1, r0, #0 ldr r0, [r5] - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x34] ldr r1, [sp, #0x20] ldr r2, [r5, #0x34] @@ -1259,7 +1259,7 @@ _021D7E00: bl GetNarcMemberSizeByIdPair add r1, r0, #0 ldr r0, [r5] - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x38] ldr r2, [r5, #0x38] add r0, r6, #0 @@ -1360,9 +1360,9 @@ ov61_021D7FB4: ; 0x021D7FB4 sub sp, #4 add r4, r0, #0 ldr r0, [r4, #0x38] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x34] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x30] mov r1, #2 bl PaletteData_FreeBuffers diff --git a/arm9/overlays/62/asm/overlay_62.s b/arm9/overlays/62/asm/overlay_62.s index 12f139403..1e243f0b9 100644 --- a/arm9/overlays/62/asm/overlay_62.s +++ b/arm9/overlays/62/asm/overlay_62.s @@ -1569,7 +1569,7 @@ _0222E160: mov r1, #0 str r1, [r0] add r0, r7, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [sp] bl SysTask_Destroy _0222E17C: @@ -1587,7 +1587,7 @@ ov62_0222E180: ; 0x0222E180 mov r0, #0x35 lsl r1, r1, #4 str r2, [sp, #0x10] - bl AllocFromHeap + bl Heap_Alloc str r0, [sp, #0x1c] ldr r0, [sp, #8] mov r1, #0x59 @@ -5227,7 +5227,7 @@ _0222FDFC: add r0, r5, #0 bl SysTask_Destroy add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, pc} _0222FE1C: add r0, r0, #1 @@ -5243,7 +5243,7 @@ ov62_0222FE24: ; 0x0222FE24 add r5, r1, #0 mov r0, #0x35 mov r1, #0xc - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r0, #1 str r0, [r4] diff --git a/arm9/overlays/63/asm/ov63_021D74E0.s b/arm9/overlays/63/asm/ov63_021D74E0.s index f1b39ffc0..a795d6657 100644 --- a/arm9/overlays/63/asm/ov63_021D74E0.s +++ b/arm9/overlays/63/asm/ov63_021D74E0.s @@ -42,7 +42,7 @@ ov63_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x1e lsl r2, r2, #0x12 - bl CreateHeap + bl Heap_Create mov r1, #0x79 add r0, r4, #0 lsl r1, r1, #2 @@ -363,7 +363,7 @@ ov63_021D77B4: ; 0x021D77B4 add r0, r7, #0 bl OverlayManager_FreeData add r0, r4, #0 - bl DestroyHeap + bl Heap_Destroy cmp r5, #1 beq _021D77F2 cmp r5, #2 @@ -500,7 +500,7 @@ ov63_021D78BC: ; 0x021D78BC add r0, #0x68 add r1, r4, #0 mov r2, #4 - bl GF_ExpHeap_FndInitAllocator + bl HeapExp_FndInitAllocator mov r0, #0x30 add r1, r6, #0 add r2, r4, #0 @@ -581,9 +581,9 @@ ov63_021D7970: ; 0x021D7970 add r0, #0x68 bl NNS_G3dFreeAnmObj ldr r0, [r4, #0x60] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x5c] - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov63_021D7970 @@ -882,7 +882,7 @@ ov63_021D7B9C: ; 0x021D7B9C mov r1, #7 bl FreeBgTilemapBuffer ldr r0, [r4, #4] - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov63_021D7B9C diff --git a/arm9/overlays/63/asm/ov63_021D8890.s b/arm9/overlays/63/asm/ov63_021D8890.s index f0fc80aed..98338fada 100644 --- a/arm9/overlays/63/asm/ov63_021D8890.s +++ b/arm9/overlays/63/asm/ov63_021D8890.s @@ -586,7 +586,7 @@ ov63_021D8D10: ; 0x021D8D10 mov r0, #3 mov r1, #0x4c lsl r2, r0, #0x11 - bl CreateHeap + bl Heap_Create mov r1, #0xab add r0, r4, #0 lsl r1, r1, #2 @@ -739,7 +739,7 @@ ov63_021D8E68: ; 0x021D8E68 add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0x4c - bl DestroyHeap + bl Heap_Destroy ldr r0, _021D8E94 ; =SDK_OVERLAY_OVERLAY_63_ID ldr r1, _021D8E98 ; =ov63_021DBAB8 bl RegisterMainOverlay @@ -1217,7 +1217,7 @@ ov63_021D9234: ; 0x021D9234 mov r1, #5 bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] - bl FreeToHeap + bl Heap_Free mov r0, #0 strb r0, [r4, #0x1a] _021D9286: @@ -1518,14 +1518,14 @@ ov63_021D9498: ; 0x021D9498 add r6, r0, #0 mov r0, #0x4c add r1, r4, #0 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x44] mov r0, #0x10 bl ov63_021DAF20 str r0, [r5, #0x48] mov r0, #0x4c add r1, r6, #0 - bl AllocFromHeap + bl Heap_Alloc str r0, [r5, #0x4c] ldr r0, [r5, #0x44] mov r1, #0 @@ -1642,14 +1642,14 @@ _021D95D0: add r0, r5, r0 add r0, #0xd0 ldr r0, [r0] - bl FreeToHeap + bl Heap_Free add r0, r4, #1 lsl r0, r0, #0x18 lsr r4, r0, #0x18 cmp r4, #6 blo _021D95D0 ldr r0, [r5, #0x70] - bl FreeToHeap + bl Heap_Free add r0, r5, #0 mov r1, #0 add r0, #0x38 @@ -1667,7 +1667,7 @@ _021D9608: lsl r0, r4, #2 add r0, r5, r0 ldr r0, [r0, #0x50] - bl FreeToHeap + bl Heap_Free add r0, r4, #1 lsl r0, r0, #0x18 lsr r4, r0, #0x18 @@ -1693,7 +1693,7 @@ _021D963C: ldr r0, [r5, #0x44] cmp r0, #0 beq _021D964A - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r5, #0x44] _021D964A: @@ -1702,7 +1702,7 @@ _021D964A: beq _021D965E bl ov63_021DB580 ldr r0, [r5, #0x4c] - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r5, #0x4c] _021D965E: @@ -1719,7 +1719,7 @@ _021D965E: mov r1, #4 bl FreeBgTilemapBuffer ldr r0, [r5, #0xc] - bl FreeToHeap + bl Heap_Free ldr r0, [r5, #0x10] bl sub_020223BC mov r0, #0 @@ -1771,7 +1771,7 @@ _021D96C6: cmp r0, #0 bne _021D96F8 ldr r0, [r6, #0x2c] - bl FreeToHeap + bl Heap_Free bl GF_AssertFail b _021D96F8 _021D96F4: @@ -1930,7 +1930,7 @@ _021D9840: ldr r1, [r2, #0x14] add r1, r2, r1 sub r1, r1, r0 - bl ReallocFromHeap + bl Heap_Realloc mov r0, #0x80 mov r1, #0x4c bl NARC_New @@ -3042,7 +3042,7 @@ ov63_021DA158: ; 0x021DA158 cmp r0, #0 bne _021DA192 ldr r0, [r4, #0x14] - bl FreeToHeap + bl Heap_Free bl GF_AssertFail b _021DA192 _021DA18E: @@ -3371,7 +3371,7 @@ ov63_021DA418: ; 0x021DA418 mov r1, #5 bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] - bl FreeToHeap + bl Heap_Free ldr r0, _021DA470 ; =0x0000028E mov r1, #0 strb r1, [r4, r0] @@ -3382,7 +3382,7 @@ _021DA458: beq _021DA46E add r0, #0xd ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free ldr r0, _021DA474 ; =0x0000028F mov r1, #0 strb r1, [r4, r0] diff --git a/arm9/overlays/63/asm/ov63_021DAE5C.s b/arm9/overlays/63/asm/ov63_021DAE5C.s index 4223cdbae..5fed49ea4 100644 --- a/arm9/overlays/63/asm/ov63_021DAE5C.s +++ b/arm9/overlays/63/asm/ov63_021DAE5C.s @@ -90,7 +90,7 @@ ov63_021DAEF8: ; 0x021DAEF8 mov r1, #0x7d mov r0, #0x4c lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x7d add r4, r0, #0 mov r1, #0 @@ -110,14 +110,14 @@ ov63_021DAF20: ; 0x021DAF20 add r5, r0, #0 mov r0, #0x4c mov r1, #8 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r0, #0xc add r6, r5, #0 mul r6, r0 mov r0, #0x4c add r1, r6, #0 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0 add r2, r6, #0 str r0, [r4, #4] @@ -151,9 +151,9 @@ _021DAF68: blt _021DAF5A _021DAF72: ldr r0, [r5, #4] - bl FreeToHeap + bl Heap_Free add r0, r5, #0 - bl FreeToHeap + bl Heap_Free pop {r4, r5, r6, pc} thumb_func_end ov63_021DAF4C @@ -215,7 +215,7 @@ _021DAFDA: cmp r4, #0xa blo _021DAFCA add r0, r5, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov63_021DAF9C diff --git a/arm9/overlays/63/src/ov63_021DB450.c b/arm9/overlays/63/src/ov63_021DB450.c index e3ee0a33b..d2d869498 100644 --- a/arm9/overlays/63/src/ov63_021DB450.c +++ b/arm9/overlays/63/src/ov63_021DB450.c @@ -16,13 +16,13 @@ extern u32 (*NNS_GfdDefaultFuncAllocPlttVram)(u32 param0, u32 param1, u32 param2 extern void sub_0201327C(u32 param0); extern void sub_020132BC(u32 param0); -extern void *sub_02012CDC(void *, void *, void *, u32, u32, HeapID); +extern void *sub_02012CDC(void *, void *, void *, u32, u32, enum HeapID); extern void sub_02068C00(struct UnkStruct_02006D98_4 *, u16, u32, u32, u32, u32, u32); extern void sub_02012CC8(void); extern struct Camera *sub_0201343C(void); extern void sub_02013194(void *, u32, u32, u32); -extern u32 sub_0201318C(u32, u32, HeapID); +extern u32 sub_0201318C(u32, u32, enum HeapID); extern void sub_02012DE4(void *); @@ -76,7 +76,7 @@ void Title_SetupMonAnimationSprites(struct UnkStruct63_021DB450 *arg0) // TODO: sub_02007558(arg0->field_04[1], 35, 1); arg0->field_10 = 1; sub_02012CC8(); - arg0->field_14 = AllocFromHeap(HEAP_ID_76, 0x4800); + arg0->field_14 = Heap_Alloc(HEAP_ID_76, 0x4800); arg0->field_18 = sub_02012CDC(ov63_021DB450, ov63_021DB474, arg0->field_14, 0x4800, 1, HEAP_ID_76); Camera_SetPerspectiveClippingPlane(0x1000, 0x384000, sub_0201343C()); sub_02013194(arg0->field_18, sub_0201318C(0x3D, 4, HEAP_ID_76), 10, 1); @@ -84,7 +84,7 @@ void Title_SetupMonAnimationSprites(struct UnkStruct63_021DB450 *arg0) // TODO: void ov63_021DB580(UnkStruct63_021DB450 *param0) { sub_02012DE4(param0->field_18); - FreeToHeap(param0->field_14); + Heap_Free(param0->field_14); sub_020072E8(param0->field_00); } diff --git a/arm9/overlays/64/asm/overlay_64.s b/arm9/overlays/64/asm/overlay_64.s index 892ae5910..4047bfb7d 100644 --- a/arm9/overlays/64/asm/overlay_64.s +++ b/arm9/overlays/64/asm/overlay_64.s @@ -12,7 +12,7 @@ ov64_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x2f lsl r2, r2, #0x12 - bl CreateHeap + bl Heap_Create ldr r1, _021D7630 ; =0x000006B4 add r0, r4, #0 mov r2, #0x2f @@ -30,7 +30,7 @@ _021D7504: add r0, r5, r0 mov r1, #0x2f mov r2, #0x20 - bl GF_ExpHeap_FndInitAllocator + bl HeapExp_FndInitAllocator add r0, r4, #0 bl OverlayManager_GetField18 add r4, r0, #0 @@ -293,13 +293,13 @@ _021D7726: bl ov64_021D7A38 add r4, #0x94 ldr r0, [r4] - bl FreeToHeap + bl Heap_Free bl ov64_021D7828 bl sub_0201C29C add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0x2f - bl DestroyHeap + bl Heap_Destroy mov r0, #1 pop {r4, r5, r6, pc} thumb_func_end ov64_021D76F4 @@ -727,7 +727,7 @@ ov64_021D7AEC: ; 0x021D7AEC bl RemoveWindow add r4, #0x98 ldr r0, [r4] - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov64_021D7AEC @@ -1121,7 +1121,7 @@ ov64_021D7E04: ; 0x021D7E04 add r4, r1, #0 cmp r0, #0 beq _021D7E14 - bl FreeToHeap + bl Heap_Free _021D7E14: ldr r0, [r5, #0x64] cmp r0, #0 @@ -1130,7 +1130,7 @@ _021D7E14: add r0, r4, #0 bl NNS_G3dFreeAnmObj ldr r0, [r5, #0x64] - bl FreeToHeap + bl Heap_Free _021D7E28: add r0, r5, #0 mov r1, #0 @@ -2991,9 +2991,9 @@ ov64_021D8C0C: ; 0x021D8C0C ldr r0, [r4, #4] bl sub_02013E44 ldr r0, [r4, #0xc] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x10] - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov64_021D8C0C @@ -3480,7 +3480,7 @@ _021D8FB2: add r0, r5, #0 add r0, #0x9c ldr r0, [r0] - bl FreeToHeap + bl Heap_Free add r4, r4, #1 add r5, r5, #4 cmp r4, #3 diff --git a/arm9/overlays/65/asm/overlay_65.s b/arm9/overlays/65/asm/overlay_65.s index 2eb727e4c..31d873812 100644 --- a/arm9/overlays/65/asm/overlay_65.s +++ b/arm9/overlays/65/asm/overlay_65.s @@ -13,7 +13,7 @@ ov65_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x2d lsl r2, r2, #0x10 - bl CreateHeap + bl Heap_Create mov r1, #2 add r0, r4, #0 lsl r1, r1, #8 @@ -80,7 +80,7 @@ ov65_021D753C: ; 0x021D753C add r0, r5, #0 bl OverlayManager_FreeData ldr r0, [r4] - bl DestroyHeap + bl Heap_Destroy mov r0, #1 pop {r3, r4, r5, pc} thumb_func_end ov65_021D753C @@ -819,7 +819,7 @@ _021D7B0A: cmp r4, #6 blt _021D7B0A ldr r0, [r5, #0x24] - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end ov65_021D7B04 @@ -2710,7 +2710,7 @@ ov65_021D8A08: ; 0x021D8A08 mov r0, #3 mov r1, #0x2e lsl r2, r2, #0x10 - bl CreateHeap + bl Heap_Create mov r1, #0x6f add r0, r4, #0 lsl r1, r1, #2 @@ -2921,7 +2921,7 @@ ov65_021D8BBC: ; 0x021D8BBC add r0, r5, #0 bl OverlayManager_FreeData ldr r0, [r4] - bl DestroyHeap + bl Heap_Destroy mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 @@ -3149,7 +3149,7 @@ _021D8D6E: mov r1, #4 bl FreeBgTilemapBuffer ldr r0, [r5, #0x68] - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end ov65_021D8D68 diff --git a/arm9/overlays/66/asm/overlay_66.s b/arm9/overlays/66/asm/overlay_66.s index a4096f0aa..cf15d10bc 100644 --- a/arm9/overlays/66/asm/overlay_66.s +++ b/arm9/overlays/66/asm/overlay_66.s @@ -13,7 +13,7 @@ ov66_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x11 lsl r2, r2, #0x10 - bl CreateHeap + bl Heap_Create add r0, r4, #0 mov r1, #0xe4 mov r2, #0x11 @@ -119,7 +119,7 @@ ov66_021D75B0: ; 0x021D75B0 add r0, r4, #0 bl OverlayManager_FreeData mov r0, #0x11 - bl DestroyHeap + bl Heap_Destroy mov r0, #1 pop {r4, pc} thumb_func_end ov66_021D75B0 @@ -341,7 +341,7 @@ _021D7782: cmp r4, #8 blt _021D7782 ldr r0, [r5, #0x28] - bl FreeToHeap + bl Heap_Free ldr r0, [r5, #0x40] bl ov66_021D9544 ldr r0, [r5, #0x30] @@ -661,34 +661,34 @@ ov66_021D7A34: ; 0x021D7A34 add r4, r0, #0 add r0, #0xb4 ldr r0, [r0] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 add r0, #0xb0 ldr r0, [r0] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 add r0, #0xac ldr r0, [r0] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 add r0, #0xa8 ldr r0, [r0] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 add r0, #0xa4 ldr r0, [r0] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 add r0, #0xa0 ldr r0, [r0] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 add r0, #0x9c ldr r0, [r0] - bl FreeToHeap + bl Heap_Free add r4, #0x98 ldr r0, [r4] - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov66_021D7A34 @@ -866,7 +866,7 @@ ov66_021D7BB4: ; 0x021D7BB4 mov r1, #0x11 ldr r0, [r4, #4] lsl r1, r1, #4 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x11 mov r1, #0 lsl r2, r2, #4 @@ -896,7 +896,7 @@ _021D7BEA: add r0, r5, #0 bl ov66_021D8670 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #1 pop {r3, r4, r5, pc} thumb_func_end ov66_021D7BD4 @@ -3754,7 +3754,7 @@ ov66_021D9228: ; 0x021D9228 mov r1, #0xc str r2, [sp, #8] add r4, r3, #0 - bl AllocFromHeap + bl Heap_Alloc add r7, r0, #0 mov r0, #0 strb r0, [r7] @@ -3774,7 +3774,7 @@ ov66_021D9228: ; 0x021D9228 mov r1, #0x1c add r0, r5, #0 mul r1, r2 - bl AllocFromHeap + bl Heap_Alloc str r0, [r7, #8] ldrh r3, [r7] mov r2, #0x1c @@ -3912,9 +3912,9 @@ _021D935E: blt _021D935E _021D9380: ldr r0, [r5, #8] - bl FreeToHeap + bl Heap_Free add r0, r5, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, r6, r7, pc} .align 2, 0 thumb_func_end ov66_021D9350 @@ -4109,7 +4109,7 @@ _021D94C8: _021D94DA: add r0, r4, #0 mov r1, #8 - bl AllocFromHeap + bl Heap_Alloc add r6, r0, #0 mov r0, #0 strb r0, [r6] @@ -4124,7 +4124,7 @@ _021D94DA: mov r1, #0x18 add r0, r4, #0 mul r1, r2 - bl AllocFromHeap + bl Heap_Alloc str r0, [r6, #4] ldr r3, [sp] mov r2, #0x18 @@ -4164,9 +4164,9 @@ ov66_021D9544: ; 0x021D9544 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #4] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov66_021D9544 diff --git a/arm9/overlays/67/asm/overlay_67.s b/arm9/overlays/67/asm/overlay_67.s index 8a1b776f1..bb8e10139 100644 --- a/arm9/overlays/67/asm/overlay_67.s +++ b/arm9/overlays/67/asm/overlay_67.s @@ -35,7 +35,7 @@ ov67_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x2a lsl r2, r2, #0x10 - bl CreateHeap + bl Heap_Create add r0, r4, #0 bl OverlayManager_GetField18 add r5, r0, #0 @@ -165,7 +165,7 @@ ov67_021D7624: ; 0x021D7624 add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0x2a - bl DestroyHeap + bl Heap_Destroy mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 @@ -327,7 +327,7 @@ ov67_021D777C: ; 0x021D777C bl FreeBgTilemapBuffer mov r0, #0x2a add r1, r4, #0 - bl FreeToHeapExplicit + bl Heap_FreeExplicit pop {r4, pc} .align 2, 0 thumb_func_end ov67_021D777C @@ -3315,7 +3315,7 @@ ov67_021D8F00: ; 0x021D8F00 ldr r1, [sp, #0xc] bl BufferBoxMonSpeciesName add r0, r6, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov67_021D8F00 diff --git a/arm9/overlays/68/asm/overlay_68.s b/arm9/overlays/68/asm/overlay_68.s index 2b9adc162..b54d003ed 100644 --- a/arm9/overlays/68/asm/overlay_68.s +++ b/arm9/overlays/68/asm/overlay_68.s @@ -32,7 +32,7 @@ ov68_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x24 lsr r2, r2, #9 - bl CreateHeap + bl Heap_Create mov r1, #0x81 add r0, r4, #0 lsl r1, r1, #2 @@ -166,14 +166,14 @@ ov68_021D762C: ; 0x021D762C mov r0, #0x7f lsl r0, r0, #2 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0 add r1, r0, #0 bl Main_SetVBlankIntrCB mov r0, #0x24 - bl DestroyHeap + bl Heap_Destroy ldr r0, _021D767C ; =0x04000050 mov r1, #0 strh r1, [r0] @@ -320,7 +320,7 @@ ov68_021D7774: ; 0x021D7774 bl FreeBgTilemapBuffer mov r0, #0x24 add r1, r4, #0 - bl FreeToHeapExplicit + bl Heap_FreeExplicit pop {r4, pc} .align 2, 0 thumb_func_end ov68_021D7774 @@ -372,7 +372,7 @@ ov68_021D77A4: ; 0x021D77A4 bl GfGfxLoader_GXLoadPal mov r0, #0x24 mov r1, #0x80 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 ldr r0, _021D7854 ; =0x00003001 mov r2, #0 @@ -395,7 +395,7 @@ _021D7812: mov r3, #2 bl LoadRectToBgTilemapRect add r0, r4, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r5] mov r1, #1 bl BgCommitTilemapBufferToVram @@ -1375,7 +1375,7 @@ ov68_021D7F98: ; 0x021D7F98 mov r0, #0x7f lsl r0, r0, #2 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free mov r0, #0x7e lsl r0, r0, #2 ldr r0, [r4, r0] diff --git a/arm9/overlays/69/asm/overlay_69.s b/arm9/overlays/69/asm/overlay_69.s index 5ee578f33..e5d7041a6 100644 --- a/arm9/overlays/69/asm/overlay_69.s +++ b/arm9/overlays/69/asm/overlay_69.s @@ -13,7 +13,7 @@ HOF_OverlayInit: ; 0x0222D5C0 mov r0, #3 mov r1, #0x3f lsl r2, r0, #0x10 - bl CreateHeap + bl Heap_Create ldr r1, _0222D70C ; =0x00001B60 add r0, r5, #0 mov r2, #0x3f @@ -213,7 +213,7 @@ _0222D762: add r0, r6, #0 bl OverlayManager_FreeData mov r0, #0x3f - bl DestroyHeap + bl Heap_Destroy ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -911,7 +911,7 @@ ov69_0222DD18: ; 0x0222DD18 mov r1, #3 bl FreeBgTilemapBuffer ldr r0, [r4, #0x10] - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 _0222DD50: .word 0xFFFF1FFF @@ -1412,9 +1412,9 @@ _0222E10E: mov r1, #0 bl sub_020200A0 ldr r0, [sp, #0x24] - bl FreeToHeap + bl Heap_Free ldr r0, [sp, #0x28] - bl FreeToHeap + bl Heap_Free add sp, #0xd4 pop {r4, r5, r6, r7, pc} nop @@ -1444,11 +1444,11 @@ _0222E1C2: mov r0, #0x17 lsl r0, r0, #4 ldr r0, [r6, r0] - bl FreeToHeap + bl Heap_Free mov r0, #0x5b lsl r0, r0, #2 ldr r0, [r6, r0] - bl FreeToHeap + bl Heap_Free ldr r0, [r6, #0x24] bl sub_0201FD58 bl DeinitOamData @@ -1463,7 +1463,7 @@ ov69_0222E1E4: ; 0x0222E1E4 mov r2, #0 str r2, [r0] ldr r0, [r1] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl SysTask_Destroy pop {r4, pc} @@ -1495,7 +1495,7 @@ ov69_0222E218: ; 0x0222E218 mov r0, #0x3f mov r1, #0x2c str r2, [sp] - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x6d lsl r1, r1, #6 add r4, r6, r1 @@ -1582,7 +1582,7 @@ ov69_0222E2D8: ; 0x0222E2D8 add r7, r1, #0 mov r0, #0x3f mov r1, #0x2c - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x6d lsl r1, r1, #6 add r5, r0, #0 @@ -1895,7 +1895,7 @@ ov69_0222E53C: ; 0x0222E53C mov r0, #0x3f mov r1, #0x1c add r6, r2, #0 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x6d lsl r1, r1, #6 add r5, r0, #0 @@ -1933,7 +1933,7 @@ ov69_0222E590: ; 0x0222E590 mov r0, #0x3f mov r1, #0x28 add r6, r2, #0 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x6d lsl r1, r1, #6 add r5, r0, #0 @@ -1976,7 +1976,7 @@ ov69_0222E5F0: ; 0x0222E5F0 add r6, r1, #0 mov r0, #0x3f mov r1, #0x28 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x6d lsl r1, r1, #6 add r5, r0, #0 @@ -2015,7 +2015,7 @@ ov69_0222E644: ; 0x0222E644 add r6, r1, #0 mov r0, #0x3f mov r1, #0x38 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x6d lsl r1, r1, #6 add r5, r0, #0 @@ -2059,7 +2059,7 @@ ov69_0222E6A0: ; 0x0222E6A0 add r6, r1, #0 mov r0, #0x3f mov r1, #0x38 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x6d lsl r1, r1, #6 add r5, r0, #0 @@ -2106,7 +2106,7 @@ ov69_0222E6FC: ; 0x0222E6FC mov r1, #0x74 str r2, [sp] str r3, [sp, #4] - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x6d lsl r1, r1, #6 add r7, r5, r1 @@ -2234,7 +2234,7 @@ ov69_0222E804: ; 0x0222E804 mov r0, #0x3f mov r1, #0x38 str r2, [sp] - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x6d lsl r1, r1, #6 add r6, r5, r1 @@ -2541,7 +2541,7 @@ ov69_0222EA84: ; 0x0222EA84 add r7, r1, #0 mov r0, #0x3f mov r1, #0x30 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x6d lsl r1, r1, #6 add r4, r0, #0 @@ -2761,7 +2761,7 @@ ov69_0222EC60: ; 0x0222EC60 add r6, r1, #0 mov r0, #0x3f mov r1, #0xdc - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x6d lsl r1, r1, #6 add r1, r5, r1 @@ -2943,7 +2943,7 @@ ov69_0222EDCC: ; 0x0222EDCC ldr r1, _0222EE10 ; =0x00000844 add r5, r0, #0 mov r0, #0x3f - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _0222EE0C ldr r0, _0222EE14 ; =0x0222F940 @@ -3090,7 +3090,7 @@ ov69_0222EF00: ; 0x0222EF00 mov r0, #0x3f add r7, r2, #0 add r4, r3, #0 - bl AllocFromHeap + bl Heap_Alloc add r1, r0, #0 beq _0222EF74 ldr r0, _0222EF7C ; =0x00000818 @@ -3384,7 +3384,7 @@ _0222F170: ldr r0, _0222F198 ; =0x00000818 ldr r0, [r5, r0] bl sub_0201B6C8 - bl FreeToHeap + bl Heap_Free ldr r0, [r6, r7] add r4, r4, #1 add r5, r5, #4 @@ -3392,7 +3392,7 @@ _0222F170: blt _0222F170 _0222F186: add r0, r6, #0 - bl FreeToHeap + bl Heap_Free _0222F18C: pop {r3, r4, r5, r6, r7, pc} nop @@ -3420,7 +3420,7 @@ ov69_0222F1B0: ; 0x0222F1B0 sub sp, #0x2c ldr r1, _0222F344 ; =0x00008D64 mov r0, #0x3f - bl AllocFromHeap + bl Heap_Alloc str r0, [sp, #0x28] bl LCRandom str r0, [sp, #0x20] @@ -3624,7 +3624,7 @@ ov69_0222F360: ; 0x0222F360 add r4, r0, #0 beq _0222F374 bl sub_0201B6C8 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl SysTask_Destroy _0222F374: diff --git a/arm9/overlays/70/asm/overlay_70.s b/arm9/overlays/70/asm/overlay_70.s index 088450f04..c1dfd9a6f 100644 --- a/arm9/overlays/70/asm/overlay_70.s +++ b/arm9/overlays/70/asm/overlay_70.s @@ -11,12 +11,12 @@ ov70_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x3c lsl r2, r2, #0xe - bl CreateHeap + bl Heap_Create mov r2, #7 mov r0, #3 mov r1, #0x3d lsl r2, r2, #0xe - bl CreateHeap + bl Heap_Create add r0, r5, #0 mov r1, #0xdc mov r2, #0x3c @@ -76,9 +76,9 @@ ov70_021D755C: ; 0x021D755C add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0x3d - bl DestroyHeap + bl Heap_Destroy mov r0, #0x3c - bl DestroyHeap + bl Heap_Destroy mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 @@ -399,7 +399,7 @@ ov70_021D77CC: ; 0x021D77CC add r5, r0, #0 ldr r1, _021D7894 ; =0x00000E1C mov r0, #0x3d - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _021D788C str r5, [r4] @@ -497,7 +497,7 @@ ov70_021D78A0: ; 0x021D78A0 mov r0, #0x66 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free mov r0, #0x65 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -526,9 +526,9 @@ ov70_021D78A0: ; 0x021D78A0 bl sub_0201FD58 bl DeinitOamData ldr r0, [r4, #0x10] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _021D790A: pop {r4, pc} thumb_func_end ov70_021D78A0 @@ -1408,11 +1408,11 @@ _021D7FDA: mov r0, #0x5e lsl r0, r0, #2 ldr r0, [r7, r0] - bl FreeToHeap + bl Heap_Free mov r0, #0x5f lsl r0, r0, #2 ldr r0, [r7, r0] - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov70_021D7FC4 @@ -1505,9 +1505,9 @@ _021D8050: cmp r0, #6 blt _021D8050 ldr r0, [sp, #8] - bl FreeToHeap + bl Heap_Free ldr r0, [sp, #0xc] - bl FreeToHeap + bl Heap_Free add sp, #0x94 pop {r4, r5, r6, r7, pc} nop diff --git a/arm9/overlays/71/asm/overlay_71.s b/arm9/overlays/71/asm/overlay_71.s index 03bc23df1..18776fa8b 100644 --- a/arm9/overlays/71/asm/overlay_71.s +++ b/arm9/overlays/71/asm/overlay_71.s @@ -27,7 +27,7 @@ ov71_0222D5C0: ; 0x0222D5C0 ldr r2, _0222D734 ; =0x000707D0 mov r0, #3 mov r1, #0x1a - bl CreateHeap + bl Heap_Create ldr r1, _0222D738 ; =0x000036B4 add r0, r5, #0 mov r2, #0x1a @@ -1684,7 +1684,7 @@ _0222E3EA: mov r0, #0x79 lsl r0, r0, #4 ldr r0, [r5, r0] - bl FreeToHeap + bl Heap_Free ldr r0, [r6, r7] add r5, r5, #4 add r4, r4, #1 @@ -1703,7 +1703,7 @@ _0222E402: _0222E414: ldr r0, _0222E434 ; =0x000007A8 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free ldr r0, [r6, r7] add r4, r4, #4 add r5, r5, #1 @@ -1736,7 +1736,7 @@ ov71_0222E438: ; 0x0222E438 bl String_Delete ldr r0, _0222E4D4 ; =0x0000221C ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl ov71_0222E378 ldr r0, _0222E4D8 ; =0x00000438 @@ -1750,7 +1750,7 @@ ov71_0222E438: ; 0x0222E438 lsl r1, r1, #2 ldr r1, [r4, r1] mov r0, #0x1a - bl FreeToHeapExplicit + bl Heap_FreeExplicit mov r0, #0x61 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -1777,7 +1777,7 @@ ov71_0222E438: ; 0x0222E438 add r1, r0, #0 bl Main_SetVBlankIntrCB mov r0, #0x1a - bl DestroyHeap + bl Heap_Destroy mov r0, #1 pop {r3, r4, r5, pc} nop @@ -2146,7 +2146,7 @@ ov71_0222E76C: ; 0x0222E76C bl SaveArray_Party_sizeof add r1, r0, #0 mov r0, #0x1a - bl AllocFromHeap + bl Heap_Alloc ldr r1, _0222E844 ; =0x0000221C str r0, [r5, r1] ldr r0, [r5, r1] @@ -2249,7 +2249,7 @@ _0222E8B2: bl BG_LoadScreenTilemapData _0222E8D0: add r0, r6, #0 - bl FreeToHeap + bl Heap_Free _0222E8D6: add sp, #8 pop {r4, r5, r6, pc} @@ -4363,7 +4363,7 @@ _0222F9A0: add r2, r6, #0 bl BufferPlayersName add r0, r6, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 mov r1, #0x24 bl ov71_0222F84C @@ -6404,9 +6404,9 @@ _02230A98: mov r1, #0x13 bl GameStats_Inc add r0, r7, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 diff --git a/arm9/overlays/73/asm/overlay_73.s b/arm9/overlays/73/asm/overlay_73.s index 943abe760..17162b17b 100644 --- a/arm9/overlays/73/asm/overlay_73.s +++ b/arm9/overlays/73/asm/overlay_73.s @@ -23,7 +23,7 @@ ov73_021D74F0: ; 0x021D74F0 mov r0, #3 mov r1, #0x38 lsl r2, r2, #0x10 - bl CreateHeap + bl Heap_Create ldr r1, _021D757C ; =0x000015E8 add r0, r5, #0 mov r2, #0x38 @@ -201,7 +201,7 @@ ov73_021D7640: ; 0x021D7640 mov r0, #0 str r0, [r6, #0x18] add r0, r4, #0 - bl DestroyHeap + bl Heap_Destroy mov r0, #1 pop {r3, r4, r5, r6, r7, pc} nop @@ -872,7 +872,7 @@ _021D7BC6: bl GF_AssertFail _021D7C0C: add r0, r6, #0 - bl FreeToHeap + bl Heap_Free _021D7C12: ldr r0, [r5] add r0, r0, #1 @@ -2023,7 +2023,7 @@ ov73_021D856C: ; 0x021D856C _021D857C: ldr r0, _021D858C ; =0x0000152C ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free ldr r0, _021D858C ; =0x0000152C mov r1, #0 str r1, [r4, r0] @@ -2522,7 +2522,7 @@ ov73_021D8980: ; 0x021D8980 mov r1, #1 bl FreeBgTilemapBuffer ldr r0, [r4] - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov73_021D8980 @@ -3425,7 +3425,7 @@ ov73_021D9094: ; 0x021D9094 mov r1, #8 str r2, [sp] add r5, r3, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 mov r0, #0 str r5, [r4] @@ -3481,7 +3481,7 @@ ov73_021D90F4: ; 0x021D90F4 bl ov73_021D91BC _021D9104: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov73_021D90F4 @@ -3508,7 +3508,7 @@ ov73_021D9120: ; 0x021D9120 add r0, r3, #0 lsl r1, r1, #4 add r7, r2, #0 - bl AllocFromHeap + bl Heap_Alloc mov r2, #0x1b mov r1, #0 lsl r2, r2, #4 @@ -3591,7 +3591,7 @@ ov73_021D91BC: ; 0x021D91BC ldr r0, [r4, r0] bl SysTask_Destroy add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov73_021D91BC @@ -3690,7 +3690,7 @@ ov73_021D9258: ; 0x021D9258 bl sub_02013D98 add r5, r0, #0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 add sp, #0x10 pop {r3, r4, r5, pc} @@ -3716,7 +3716,7 @@ ov73_021D9288: ; 0x021D9288 bl sub_02013E14 add r5, r0, #0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 add sp, #0x10 pop {r3, r4, r5, pc} @@ -5118,9 +5118,9 @@ ov73_021D9D48: ; 0x021D9D48 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x20] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x28] - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov73_021D9D48 @@ -6047,7 +6047,7 @@ ov73_021DA374: ; 0x021DA374 ldr r0, [r4, #4] bl BgTilemapRectChangePalette add r0, r5, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #4] mov r1, #1 bl ScheduleBgTilemapBufferTransfer @@ -9210,7 +9210,7 @@ _021DBAA4: add r0, r1, r0 str r0, [sp, #0x20] add r0, r7, #0 - bl FreeToHeap + bl Heap_Free ldr r0, [sp, #0x28] add r0, r0, #1 str r0, [sp, #0x28] diff --git a/arm9/overlays/74/asm/overlay_74.s b/arm9/overlays/74/asm/overlay_74.s index a7b1ca7ef..bcb56c97e 100644 --- a/arm9/overlays/74/asm/overlay_74.s +++ b/arm9/overlays/74/asm/overlay_74.s @@ -13,7 +13,7 @@ ov74_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x4a lsl r2, r2, #0x10 - bl CreateHeap + bl Heap_Create mov r1, #0xad add r0, r4, #0 lsl r1, r1, #2 @@ -56,7 +56,7 @@ ov74_021D7540: ; 0x021D7540 add r0, r5, #0 bl OverlayManager_FreeData ldr r0, [r4] - bl DestroyHeap + bl Heap_Destroy mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 @@ -675,7 +675,7 @@ _021D79D8: blt _021D79D8 _021D79EE: ldr r0, [r6, #0x10] - bl FreeToHeap + bl Heap_Free pop {r4, r5, r6, pc} .align 2, 0 thumb_func_end ov74_021D79C8 @@ -1309,7 +1309,7 @@ _021D7F0C: cmp r0, #0x1e blt _021D7EB8 ldr r0, [sp] - bl FreeToHeap + bl Heap_Free add sp, #8 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 diff --git a/arm9/overlays/75/asm/overlay_75.s b/arm9/overlays/75/asm/overlay_75.s index 3ee0e04f4..83a8ca4fa 100644 --- a/arm9/overlays/75/asm/overlay_75.s +++ b/arm9/overlays/75/asm/overlay_75.s @@ -32,7 +32,7 @@ ov75_021E6BA0: ; 0x021E6BA0 mov r1, #6 mov r0, #3 lsl r2, r1, #0xf - bl CreateHeap + bl Heap_Create ldr r1, _021E6D60 ; =0x000004A4 add r0, r5, #0 mov r2, #6 @@ -460,7 +460,7 @@ ov75_021E6F00: ; 0x021E6F00 add r1, r0, #0 bl Main_SetVBlankIntrCB mov r0, #6 - bl DestroyHeap + bl Heap_Destroy mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 @@ -759,7 +759,7 @@ ov75_021E71BC: ; 0x021E71BC bl FreeBgTilemapBuffer mov r0, #6 add r1, r4, #0 - bl FreeToHeapExplicit + bl Heap_FreeExplicit pop {r4, pc} .align 2, 0 thumb_func_end ov75_021E71BC @@ -4248,7 +4248,7 @@ _021E8CCC: lsr r2, r2, #0x18 bl ov75_021EB130 add r0, r7, #0 - bl FreeToHeap + bl Heap_Free add sp, #0xc pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -7904,7 +7904,7 @@ _021EA9A8: bl ScheduleWindowCopyToVram mov r0, #6 add r1, r7, #0 - bl FreeToHeapExplicit + bl Heap_FreeExplicit add sp, #0x1c pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -7993,7 +7993,7 @@ _021EAA8C: bl ScheduleWindowCopyToVram ldr r1, [sp, #0x18] mov r0, #6 - bl FreeToHeapExplicit + bl Heap_FreeExplicit add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -8620,7 +8620,7 @@ ov75_021EAF70: ; 0x021EAF70 bl BlitBitmapRectToWindow mov r0, #6 add r1, r6, #0 - bl FreeToHeapExplicit + bl Heap_FreeExplicit add sp, #0x1c pop {r3, r4, r5, r6, pc} thumb_func_end ov75_021EAF70 @@ -8695,7 +8695,7 @@ ov75_021EB004: ; 0x021EB004 bl BlitBitmapRectToWindow mov r0, #6 add r1, r6, #0 - bl FreeToHeapExplicit + bl Heap_FreeExplicit add sp, #0x1c pop {r3, r4, r5, r6, pc} .align 2, 0 diff --git a/arm9/overlays/76/asm/overlay_76.s b/arm9/overlays/76/asm/overlay_76.s index c8e78ce95..53f349fdf 100644 --- a/arm9/overlays/76/asm/overlay_76.s +++ b/arm9/overlays/76/asm/overlay_76.s @@ -11,7 +11,7 @@ ov76_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x43 lsl r2, r2, #0x10 - bl CreateHeap + bl Heap_Create mov r1, #0x62 add r0, r5, #0 lsl r1, r1, #2 @@ -166,7 +166,7 @@ ov76_021D761C: ; 0x021D761C add r0, r4, #0 bl OverlayManager_FreeData mov r0, #0x43 - bl DestroyHeap + bl Heap_Destroy mov r0, #1 pop {r4, pc} thumb_func_end ov76_021D761C @@ -382,7 +382,7 @@ ov76_021D77E4: ; 0x021D77E4 bl FreeBgTilemapBuffer mov r0, #0x43 add r1, r4, #0 - bl FreeToHeapExplicit + bl Heap_FreeExplicit pop {r4, pc} .align 2, 0 thumb_func_end ov76_021D77E4 diff --git a/arm9/overlays/77/asm/overlay_77.s b/arm9/overlays/77/asm/overlay_77.s index c87badc51..7af93b80e 100644 --- a/arm9/overlays/77/asm/overlay_77.s +++ b/arm9/overlays/77/asm/overlay_77.s @@ -28,7 +28,7 @@ ov77_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x32 lsl r2, r2, #7 - bl CreateHeap + bl Heap_Create ldr r1, _021D75DC ; =0x0000C32C add r0, r4, #0 mov r2, #0x32 @@ -824,14 +824,14 @@ ov77_021D7BAC: ; 0x021D7BAC bl sub_0201B398 ldr r0, _021D7C1C ; =0x0000C010 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free mov r0, #0 add r1, r0, #0 bl Main_SetVBlankIntrCB add r0, r6, #0 bl OverlayManager_FreeData add r0, r5, #0 - bl DestroyHeap + bl Heap_Destroy ldr r0, _021D7C20 ; =gSystem + 0x60 mov r1, #0 strb r1, [r0, #5] @@ -937,7 +937,7 @@ _021D7CC2: blt _021D7C9A _021D7CCA: ldr r0, [sp, #0x18] - bl FreeToHeap + bl Heap_Free mov r7, #1 bl sub_02088D1C str r0, [sp, #0x10] @@ -995,7 +995,7 @@ _021D7D10: blt _021D7D10 _021D7D44: ldr r0, [sp, #0x14] - bl FreeToHeap + bl Heap_Free ldr r0, [sp, #0x10] add r7, r7, #1 cmp r7, r0 @@ -2395,19 +2395,19 @@ ov77_021D88D0: ; 0x021D88D0 add r4, r0, #0 ldr r0, _021D8900 ; =0x0000C290 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free ldr r0, _021D8904 ; =0x0000C28C ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free ldr r0, _021D8908 ; =0x0000C298 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free ldr r0, _021D890C ; =0x0000C294 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free ldr r0, _021D8910 ; =0x0000C0CC ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free pop {r4, pc} nop _021D8900: .word 0x0000C290 diff --git a/arm9/overlays/78/asm/overlay_78.s b/arm9/overlays/78/asm/overlay_78.s index 64f26662c..f3ac9d2b9 100644 --- a/arm9/overlays/78/asm/overlay_78.s +++ b/arm9/overlays/78/asm/overlay_78.s @@ -12,7 +12,7 @@ ov78_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x48 lsl r2, r2, #0x10 - bl CreateHeap + bl Heap_Create add r0, r5, #0 mov r1, #0xa0 mov r2, #0x48 @@ -245,21 +245,21 @@ _021D76C8: add r0, r7, #0 bl NNS_G3dFreeAnmObj ldr r0, [r5, #0x60] - bl FreeToHeap + bl Heap_Free add r0, r4, #1 lsl r0, r0, #0x18 lsr r4, r0, #0x18 cmp r4, #4 blo _021D76C8 ldr r0, [r6, #0x5c] - bl FreeToHeap + bl Heap_Free ldr r0, [r6] bl Camera_Delete ldr r0, [sp] bl OverlayManager_FreeData bl sub_0201B398 mov r0, #0x48 - bl DestroyHeap + bl Heap_Destroy mov r0, #1 pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov78_021D76B8 @@ -338,7 +338,7 @@ ov78_021D778C: ; 0x021D778C add r0, #0x70 mov r1, #0x48 mov r2, #4 - bl GF_ExpHeap_FndInitAllocator + bl HeapExp_FndInitAllocator add r1, r5, #0 add r1, #0x9c ldrb r2, [r1] diff --git a/arm9/overlays/80/asm/overlay_80.s b/arm9/overlays/80/asm/overlay_80.s index 69497eb92..2ad497f4d 100644 --- a/arm9/overlays/80/asm/overlay_80.s +++ b/arm9/overlays/80/asm/overlay_80.s @@ -1391,7 +1391,7 @@ _0222DFE4: mov r0, #3 mov r1, #0x3e lsl r2, r2, #0x10 - bl CreateHeap + bl Heap_Create ldr r1, _0222E108 ; =0x00001044 add r0, r6, #0 mov r2, #0x3e @@ -1465,7 +1465,7 @@ _0222DFE4: bl sub_0200433C ldr r1, _0222E130 ; =0x00020020 mov r0, #0x3e - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #0x48] add r0, #0x1f mov r1, #0x1f @@ -1654,7 +1654,7 @@ ov80_0222E25C: ; 0x0222E25C bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r4, #0x48] - bl FreeToHeap + bl Heap_Free bl sub_020888CC bl sub_02088868 add r0, r4, #0 @@ -1680,16 +1680,16 @@ ov80_0222E25C: ; 0x0222E25C bl ov80_0222E398 bl sub_0202E4F0 ldr r0, [r4, #4] - bl FreeToHeap + bl Heap_Free ldr r0, [r4] - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0 add r1, r0, #0 bl Main_SetVBlankIntrCB mov r0, #0x3e - bl DestroyHeap + bl Heap_Destroy mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 @@ -2056,7 +2056,7 @@ _0222E570: mov r2, #0x60 bl GX_LoadOBJPltt ldr r0, [sp, #0x14] - bl FreeToHeap + bl Heap_Free add sp, #0x1c pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -5049,7 +5049,7 @@ ov80_0222FD88: ; 0x0222FD88 add r5, r0, #0 mov r0, #0x3e lsl r1, r1, #6 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 add r0, sp, #0x20 add r1, r5, #0 @@ -5102,7 +5102,7 @@ ov80_0222FD88: ; 0x0222FD88 lsl r3, r3, #4 bl GfGfxLoader_GXLoadPal add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0x30 pop {r4, r5, r6, pc} .align 2, 0 @@ -6687,7 +6687,7 @@ ov80_02230AC0: ; 0x02230AC0 str r0, [r4, r1] mov r0, #0x3e mov r1, #0x30 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0xfe lsl r1, r1, #4 str r0, [r4, r1] @@ -6728,16 +6728,16 @@ ov80_02230B2C: ; 0x02230B2C lsl r0, r0, #4 ldr r0, [r4, r0] ldr r0, [r0, #0x14] - bl FreeToHeap + bl Heap_Free mov r0, #0xfe lsl r0, r0, #4 ldr r0, [r4, r0] ldr r0, [r0, #0x18] - bl FreeToHeap + bl Heap_Free mov r0, #0xfe lsl r0, r0, #4 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free ldr r0, _02230B68 ; =0x00000B4C ldr r0, [r4, r0] bl String_Delete @@ -9341,7 +9341,7 @@ _022320A4: _022320C4: mov r0, #0x3e mov r1, #0x78 - bl AllocFromHeap + bl Heap_Alloc ldr r1, _022320E4 ; =0x00001004 str r0, [r4, r1] pop {r4, pc} @@ -9359,7 +9359,7 @@ ov80_022320E8: ; 0x022320E8 add r4, r0, #0 ldr r0, _02232118 ; =0x00001004 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free ldr r0, _0223211C ; =0x00000B44 ldr r0, [r4, r0] bl String_Delete @@ -10721,7 +10721,7 @@ ov80_02232BAC: ; 0x02232BAC cmp r0, #0 bne _02232BCE add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #0 pop {r3, r4, r5, pc} _02232BCE: @@ -10768,7 +10768,7 @@ ov80_02232BD4: ; 0x02232BD4 add r0, r0, #3 str r0, [r4, #4] ldr r0, [sp, #4] - bl FreeToHeap + bl Heap_Free add sp, #0xc pop {r4, r5, r6, r7, pc} thumb_func_end ov80_02232BD4 @@ -10817,7 +10817,7 @@ _02232C6E: ldr r1, _02232C84 ; =0x00001010 ldr r0, [sp] ldr r0, [r0, r1] - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, r6, r7, pc} nop _02232C84: .word 0x00001010 @@ -10947,7 +10947,7 @@ ov80_02232D7C: ; 0x02232D7C ldr r1, _02232F7C ; =0x00003D68 str r0, [sp, #0x20] mov r0, #3 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd ldr r1, _02232F80 ; =0x00001010 str r0, [sp, #0x18] str r0, [r5, r1] @@ -12034,7 +12034,7 @@ ov80_02233618: ; 0x02233618 str r0, [r4, r1] mov r0, #0x3e mov r1, #0x30 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0xfe lsl r1, r1, #4 str r0, [r4, r1] @@ -12075,16 +12075,16 @@ ov80_02233684: ; 0x02233684 lsl r0, r0, #4 ldr r0, [r4, r0] ldr r0, [r0, #0x14] - bl FreeToHeap + bl Heap_Free mov r0, #0xfe lsl r0, r0, #4 ldr r0, [r4, r0] ldr r0, [r0, #0x18] - bl FreeToHeap + bl Heap_Free mov r0, #0xfe lsl r0, r0, #4 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free ldr r0, _022336C0 ; =0x00000B4C ldr r0, [r4, r0] bl String_Delete @@ -13516,7 +13516,7 @@ ov80_02234228: ; 0x02234228 ldr r1, _02234280 ; =0x000001EE add r5, r0, #0 mov r0, #0x3e - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 ldr r2, _02234280 ; =0x000001EE mov r0, #0 @@ -13550,7 +13550,7 @@ _0223426C: blo _02234264 _02234274: add r0, r7, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 add sp, #0xc pop {r4, r5, r6, r7, pc} @@ -15274,7 +15274,7 @@ _02234F38: ldr r0, [r0] bl sub_0202ABE4 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free b _02235006 _02234F9C: add r0, r4, #0 @@ -15312,7 +15312,7 @@ _02234FA4: ldr r0, [r0] bl sub_0202ABE4 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free b _02235006 _02234FF4: str r0, [r4, #0x3c] @@ -16094,7 +16094,7 @@ ov80_02235534: ; 0x02235534 ldr r0, [r0, #0xc] bl PCStorage_DeleteBoxMonByIndexPair add r0, r4, #0 - bl FreeToHeap + bl Heap_Free b _022355DC _02235590: add r1, r5, #0 @@ -17071,11 +17071,11 @@ ov80_02235D10: ; 0x02235D10 beq _02235D2E add r0, #0xc ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free mov r0, #0xff lsl r0, r0, #4 ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free _02235D2E: pop {r4, pc} .align 2, 0 @@ -17582,7 +17582,7 @@ _02236126: mov r6, #4 _02236132: ldr r0, [sp, #0x20] - bl FreeToHeap + bl Heap_Free b _0223617E _0223613A: add r0, r4, #0 @@ -17630,11 +17630,11 @@ ov80_02236188: ; 0x02236188 mov r0, #1 lsl r0, r0, #0xc ldr r0, [r4, r0] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 add r0, #0xc8 ldr r0, [r0] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl ov80_0222E7B0 mov r0, #1 diff --git a/arm9/overlays/81/asm/overlay_81.s b/arm9/overlays/81/asm/overlay_81.s index 5bce93c2b..457be48e3 100644 --- a/arm9/overlays/81/asm/overlay_81.s +++ b/arm9/overlays/81/asm/overlay_81.s @@ -16,11 +16,11 @@ _02237E50: mov r0, #3 mov r1, #0x39 lsl r2, r0, #0xf - bl CreateHeap + bl Heap_Create mov r0, #3 mov r1, #0x3a lsl r2, r0, #0xf - bl CreateHeap + bl Heap_Create bl ov81_02238858 ldr r1, _02237FD0 ; =0x00000492 mov r0, #3 @@ -230,16 +230,16 @@ ov81_02238004: ; 0x02238004 ldr r0, [r4, #0x14] bl String_Delete ldr r0, [r4, #8] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x18] bl sub_0201FD58 bl DeinitOamData add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0x39 - bl DestroyHeap + bl Heap_Destroy mov r0, #0x3a - bl DestroyHeap + bl Heap_Destroy add r0, r6, #0 bl OS_RestoreInterrupts mov r0, #1 @@ -349,7 +349,7 @@ ov81_02238118: ; 0x02238118 add r6, r1, #0 add r1, r0, #0 add r1, #0xc7 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 ldr r0, _022381DC ; =0x00000000 str r0, [r5] @@ -366,7 +366,7 @@ ov81_02238118: ; 0x02238118 mov r2, #0x60 bl MIi_CpuClear16 add r0, r7, #0 - bl FreeToHeap + bl Heap_Free _02238152: add r1, r4, #0 mov r0, #0 @@ -492,7 +492,7 @@ _02238224: ldr r0, [r0] bl SysTask_Destroy add r0, r6, #0 - bl FreeToHeap + bl Heap_Free _02238246: pop {r4, r5, r6, pc} thumb_func_end ov81_02238200 @@ -593,7 +593,7 @@ _02238308: mov r1, #0 str r1, [r0] add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _02238328: @@ -642,7 +642,7 @@ ov81_02238358: ; 0x02238358 bne _02238404 mov r0, #0x39 mov r1, #0x18 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02238404 add r0, r5, #0 @@ -715,7 +715,7 @@ _0223838C: pop {r3, r4, r5, pc} _022383FE: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02238404: pop {r3, r4, r5, pc} nop @@ -733,7 +733,7 @@ ov81_0223840C: ; 0x0223840C cmp r0, #0 beq _0223843A bl sub_0201B6C8 - bl FreeToHeap + bl Heap_Free ldr r0, [r6, r4] bl SysTask_Destroy mov r0, #0 @@ -816,7 +816,7 @@ ov81_022384AC: ; 0x022384AC add r7, r2, #0 str r3, [sp, #4] ldr r5, [sp, #0x28] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 ldr r0, _0223850C ; =0x00000001 str r0, [r5] @@ -848,7 +848,7 @@ _022384E0: mov r0, #1 str r0, [r5] add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02238504: add r0, r4, #0 add sp, #8 @@ -981,7 +981,7 @@ _022385E8: _022385EC: mov r0, #0x39 add r1, r6, #0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r7, r0, #0 beq _02238690 ldr r3, _022386B8 ; =0x0223CF74 @@ -1053,7 +1053,7 @@ _02238648: add r0, r4, #0 bl ReleaseBoxMonLock add r0, r7, #0 - bl FreeToHeap + bl Heap_Free _02238690: ldr r0, [sp, #0x14] cmp r0, #4 @@ -1148,7 +1148,7 @@ _022386DE: lsr r3, r3, #0x18 bl BgTilemapRectChangePalette add r0, r7, #0 - bl FreeToHeap + bl Heap_Free _02238746: add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} @@ -1192,14 +1192,14 @@ ov81_02238784: ; 0x02238784 ldr r0, [r4] cmp r0, #0 beq _02238796 - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4] _02238796: ldr r0, [r4, #4] cmp r0, #0 beq _022387A4 - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4, #4] _022387A4: @@ -1363,7 +1363,7 @@ ov81_02238864: ; 0x02238864 ldr r5, _02238894 ; =0x0223D3C4 _02238876: ldr r0, [r5] - bl FreeToHeap + bl Heap_Free ldr r0, [r6] add r4, r4, #1 add r5, r5, #4 @@ -1412,7 +1412,7 @@ ov81_022388C0: ; 0x022388C0 mov r1, #0x20 add r5, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r6, r0, #0 beq _02238906 ldr r3, [sp] @@ -1422,7 +1422,7 @@ ov81_022388C0: ; 0x022388C0 mov r1, #0x8c mov r0, #0x3a mul r1, r7 - bl AllocFromHeap + bl Heap_Alloc str r0, [r6, #0x18] mov r4, #0 str r7, [r6, #0x1c] @@ -1463,11 +1463,11 @@ _0223891A: blo _0223891A _0223892C: ldr r0, [r5, #0x18] - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl ov81_02238D0C add r0, r5, #0 - bl FreeToHeap + bl Heap_Free pop {r4, r5, r6, pc} thumb_func_end ov81_0223890C @@ -1631,7 +1631,7 @@ ov81_02238A6C: ; 0x02238A6C ldr r0, [r4] cmp r0, #0 beq _02238A80 - bl FreeToHeap + bl Heap_Free mov r0, #0 str r0, [r4] str r0, [r4, #0x64] @@ -2009,7 +2009,7 @@ ov81_02238D18: ; 0x02238D18 add r5, r0, #0 mov r0, #0x3a mov r1, #0x6c - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02238D60 str r5, [r4] @@ -2077,7 +2077,7 @@ _02238DB6: ldr r0, [r4, #0xc] bl sub_020072E8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _02238DC2: pop {r4, pc} thumb_func_end ov81_02238D64 @@ -2924,7 +2924,7 @@ ov81_022394BC: ; 0x022394BC mov r1, #0x14 str r2, [sp] add r7, r3, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _02239502 str r5, [r4] @@ -3023,7 +3023,7 @@ ov81_02239578: ; 0x02239578 add r5, r0, #0 mov r0, #0x3a mov r1, #0x30 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _022395B8 str r5, [r4] @@ -3089,7 +3089,7 @@ ov81_022395E8: ; 0x022395E8 cmp r0, #0 beq _02239604 bl sub_0201B6C8 - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x68] bl SysTask_Destroy mov r0, #0 @@ -3222,7 +3222,7 @@ ov81_022396E8: ; 0x022396E8 add r5, r0, #0 mov r0, #0x3a lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _0223974A str r5, [r4] @@ -3302,7 +3302,7 @@ _02239790: ldr r0, [r0] bl SetMTRNGSeed add r0, r5, #0 - bl FreeToHeap + bl Heap_Free _022397A0: add r0, r4, #0 bl OS_RestoreInterrupts @@ -3832,7 +3832,7 @@ ov81_022399FC: ; 0x022399FC bl GfGfxLoader_LoadScrnData mov r0, #0x3a mov r1, #0x60 - bl AllocFromHeap + bl Heap_Alloc add r5, r0, #0 beq _02239C02 mov r0, #0 @@ -3857,7 +3857,7 @@ ov81_022399FC: ; 0x022399FC bl GX_EndLoadBGExtPltt bl GXS_EndLoadBGExtPltt add r0, r5, #0 - bl FreeToHeap + bl Heap_Free _02239C02: add r0, r4, #0 add r0, #0xc0 @@ -4345,7 +4345,7 @@ _02239FD0: cmp r0, #0 bne _0223A014 ldr r0, [sp] - bl FreeToHeap + bl Heap_Free _0223A014: pop {r3, r4, r5, r6, r7, pc} nop @@ -4482,7 +4482,7 @@ ov81_0223A104: ; 0x0223A104 add r6, r0, #0 mov r0, #0x3a lsl r1, r1, #4 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _0223A170 str r6, [r4] @@ -4524,7 +4524,7 @@ ov81_0223A104: ; 0x0223A104 cmp r0, #0 bne _0223A170 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _0223A170: pop {r4, r5, r6, pc} nop @@ -4615,7 +4615,7 @@ ov81_0223A1FC: ; 0x0223A1FC ldr r0, [r4, r0] bl ov81_0223A0EC add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy _0223A226: @@ -4631,7 +4631,7 @@ ov81_0223A228: ; 0x0223A228 mov r1, #0x14 add r7, r2, #0 add r6, r3, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _0223A268 lsl r0, r5, #0xc @@ -4682,7 +4682,7 @@ _0223A292: asr r1, r1, #0xc bl ov81_02238B5C add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl SysTask_Destroy pop {r3, r4, r5, pc} @@ -5469,7 +5469,7 @@ ov81_0223A898: ; 0x0223A898 add r5, r0, #0 mov r0, #0x3a mov r1, #0xa4 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _0223A8C2 str r5, [r4] @@ -5507,7 +5507,7 @@ ov81_0223A8C8: ; 0x0223A8C8 add r0, #0x34 bl ov81_0223AD88 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _0223A8F6: pop {r4, pc} thumb_func_end ov81_0223A8C8 @@ -6522,7 +6522,7 @@ ov81_0223B0E8: ; 0x0223B0E8 add r5, r0, #0 mov r0, #0x3a mov r1, #0x24 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _0223B106 str r5, [r4] @@ -6544,7 +6544,7 @@ ov81_0223B10C: ; 0x0223B10C beq _0223B11C bl ov81_0223B478 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _0223B11C: pop {r4, pc} .align 2, 0 @@ -7012,7 +7012,7 @@ ov81_0223B4E8: ; 0x0223B4E8 add r5, r0, #0 mov r0, #0x3a mov r1, #0xb0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _0223B51C str r5, [r4] @@ -7055,7 +7055,7 @@ ov81_0223B524: ; 0x0223B524 add r0, #0x34 bl ov81_0223B9A8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _0223B552: pop {r4, pc} thumb_func_end ov81_0223B524 @@ -8049,7 +8049,7 @@ ov81_0223BD18: ; 0x0223BD18 add r5, r0, #0 mov r0, #0x3a mov r1, #0x3c - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _0223BD46 str r5, [r4] @@ -8096,7 +8096,7 @@ _0223BD70: bl ov81_0223C514 _0223BD7A: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _0223BD80: pop {r4, pc} .align 2, 0 @@ -8548,7 +8548,7 @@ ov81_0223BF74: ; 0x0223BF74 bl GfGfxLoader_LoadScrnData mov r0, #0x3a mov r1, #0x60 - bl AllocFromHeap + bl Heap_Alloc add r5, r0, #0 beq _0223C14A mov r0, #0 @@ -8573,7 +8573,7 @@ ov81_0223BF74: ; 0x0223BF74 bl GX_EndLoadBGExtPltt bl GXS_EndLoadBGExtPltt add r0, r5, #0 - bl FreeToHeap + bl Heap_Free _0223C14A: ldr r0, [r4, #0xc] ldr r3, _0223C1A4 ; =0xFFFFFE80 @@ -8775,7 +8775,7 @@ ov81_0223C300: ; 0x0223C300 add r5, r1, #0 mov r0, #0x3a mov r1, #0x24 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _0223C340 str r6, [r4] @@ -8798,7 +8798,7 @@ ov81_0223C300: ; 0x0223C300 cmp r0, #0 bne _0223C340 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _0223C340: pop {r4, r5, r6, pc} nop @@ -8878,7 +8878,7 @@ ov81_0223C3CC: ; 0x0223C3CC add r5, r1, #0 mov r0, #0x3a mov r1, #0x1c - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _0223C418 str r5, [r4] @@ -8906,7 +8906,7 @@ ov81_0223C3CC: ; 0x0223C3CC cmp r0, #0 bne _0223C418 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _0223C418: pop {r4, r5, r6, pc} nop @@ -8956,7 +8956,7 @@ ov81_0223C460: ; 0x0223C460 ldr r1, [r0] mov r2, #0 str r2, [r1] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl SysTask_Destroy _0223C47A: @@ -8974,7 +8974,7 @@ ov81_0223C47C: ; 0x0223C47C str r2, [sp, #4] add r7, r3, #0 ldr r5, [sp, #0x20] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _0223C4D4 str r5, [r4] @@ -9001,7 +9001,7 @@ ov81_0223C47C: ; 0x0223C47C cmp r0, #0 bne _0223C4D8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #8 pop {r3, r4, r5, r6, r7, pc} _0223C4D4: @@ -9051,7 +9051,7 @@ ov81_0223C514: ; 0x0223C514 ldr r1, [r0] mov r2, #0 str r2, [r1] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl SysTask_Destroy _0223C52E: @@ -9064,7 +9064,7 @@ ov81_0223C530: ; 0x0223C530 add r5, r0, #0 mov r0, #0x3a mov r1, #0x70 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _0223C57A str r5, [r4] @@ -9131,7 +9131,7 @@ _0223C5C6: ldr r0, [r4, #0x10] bl sub_020072E8 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _0223C5D2: pop {r4, pc} thumb_func_end ov81_0223C580 @@ -9976,7 +9976,7 @@ ov81_0223CCA8: ; 0x0223CCA8 mov r1, #0x14 str r2, [sp] add r7, r3, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _0223CCEE str r5, [r4] @@ -10076,7 +10076,7 @@ ov81_0223CD64: ; 0x0223CD64 add r6, r1, #0 mov r0, #0x3a mov r1, #0x44 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _0223CDD2 mov r1, #0 @@ -10117,7 +10117,7 @@ ov81_0223CD64: ; 0x0223CD64 cmp r0, #0 bne _0223CDD6 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, r5, r6, pc} _0223CDD2: mov r0, #0 @@ -10138,7 +10138,7 @@ ov81_0223CDE0: ; 0x0223CDE0 ldr r1, [r0] mov r2, #0 str r2, [r1] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl SysTask_Destroy _0223CDFA: diff --git a/arm9/overlays/82/asm/overlay_82.s b/arm9/overlays/82/asm/overlay_82.s index bfa93a8e8..30772bbea 100644 --- a/arm9/overlays/82/asm/overlay_82.s +++ b/arm9/overlays/82/asm/overlay_82.s @@ -641,7 +641,7 @@ _0222DA48: mov r0, #3 mov r1, #0x44 lsl r2, r2, #0x10 - bl CreateHeap + bl Heap_Create ldr r1, _0222DB58 ; =0x00000EC8 add r0, r6, #0 mov r2, #0x44 @@ -707,7 +707,7 @@ _0222DA48: bl sub_0200433C ldr r1, _0222DB78 ; =0x00020020 mov r0, #0x44 - bl AllocFromHeap + bl Heap_Alloc str r0, [r4, #0x24] add r0, #0x1f mov r1, #0x1f @@ -858,7 +858,7 @@ ov82_0222DC50: ; 0x0222DC50 bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r4, #0x24] - bl FreeToHeap + bl Heap_Free bl sub_020888CC bl sub_02088868 add r0, r4, #0 @@ -880,14 +880,14 @@ ov82_0222DC50: ; 0x0222DC50 bl ov82_0222DD20 bl sub_0202E4F0 ldr r0, [r4, #4] - bl FreeToHeap + bl Heap_Free add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0 add r1, r0, #0 bl Main_SetVBlankIntrCB mov r0, #0x44 - bl DestroyHeap + bl Heap_Destroy mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 diff --git a/arm9/overlays/83/asm/overlay_83.s b/arm9/overlays/83/asm/overlay_83.s index 57459d44d..6442c8fb3 100644 --- a/arm9/overlays/83/asm/overlay_83.s +++ b/arm9/overlays/83/asm/overlay_83.s @@ -1852,7 +1852,7 @@ _0222E3FE: mov r1, #2 bl FreeBgTilemapBuffer ldr r0, [r7] - bl FreeToHeap + bl Heap_Free mov r0, #0 add r1, r0, #0 bl Main_SetVBlankIntrCB @@ -1916,7 +1916,7 @@ ov83_0222E48C: ; 0x0222E48C mov r0, #3 mov r1, #0x51 lsl r2, r2, #0x12 - bl CreateHeap + bl Heap_Create mov r1, #0x57 add r0, r5, #0 lsl r1, r1, #2 @@ -2372,7 +2372,7 @@ ov83_0222E850: ; 0x0222E850 add r0, r4, #0 bl OverlayManager_FreeData mov r0, #0x51 - bl DestroyHeap + bl Heap_Destroy mov r0, #0 bl ov83_02239450 mov r0, #1 @@ -3029,7 +3029,7 @@ _0222EDD0: mov r1, #5 bl FreeBgTilemapBuffer ldr r0, [r4, #4] - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov83_0222ED88 @@ -3085,7 +3085,7 @@ ov83_0222EDF8: ; 0x0222EDF8 mov r2, #3 mov r1, #0x5b lsl r2, r2, #8 - bl CreateHeap + bl Heap_Create ldr r1, _0222EE88 ; =0x00000496 mov r0, #9 mov r2, #1 @@ -3312,14 +3312,14 @@ ov83_0222F048: ; 0x0222F048 push {r4, lr} add r4, r0, #0 mov r0, #0x5b - bl DestroyHeap + bl Heap_Destroy ldr r0, _0222F06C ; =SDK_OVERLAY_OVERLAY_63_ID ldr r1, _0222F070 ; =ov63_021DBAB8 bl RegisterMainOverlay add r0, r4, #0 bl OverlayManager_FreeData mov r0, #0x55 - bl DestroyHeap + bl Heap_Destroy mov r0, #1 pop {r4, pc} nop @@ -4167,7 +4167,7 @@ ov83_0222F74C: ; 0x0222F74C mov r1, #0xf5 mov r0, #0xf lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc ldr r1, _0222F79C ; =ov83_0223B884 mov r2, #0xf5 str r0, [r1] @@ -4538,7 +4538,7 @@ ov83_0222F9DC: ; 0x0222F9DC ldr r1, _0222F9F4 ; =ov83_0223B884 mov r0, #0xf ldr r1, [r1] - bl FreeToHeapExplicit + bl Heap_FreeExplicit ldr r0, _0222F9F4 ; =ov83_0223B884 mov r1, #0 str r1, [r0] @@ -4667,7 +4667,7 @@ _0222FAB6: mov r1, #5 bl FreeBgTilemapBuffer ldr r0, [r7] - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov83_0222FA4C @@ -6505,7 +6505,7 @@ ov83_02230954: ; 0x02230954 mov r0, #3 mov r1, #0x56 lsl r2, r0, #0x10 - bl CreateHeap + bl Heap_Create ldr r1, _022309FC ; =0x00002998 add r0, r5, #0 mov r2, #0x56 @@ -6561,7 +6561,7 @@ _022309D0: mov r0, #0 mov r1, #0x5b lsl r2, r2, #8 - bl CreateHeap + bl Heap_Create mov r0, #1 pop {r3, r4, r5, pc} nop @@ -7695,11 +7695,11 @@ _0223139A: bl RegisterMainOverlay _022313A6: mov r0, #0x5b - bl DestroyHeap + bl Heap_Destroy add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0x56 - bl DestroyHeap + bl Heap_Destroy ldr r0, _022313E0 ; =0x000015D4 ldr r0, [r4, r0] cmp r0, #2 @@ -7828,7 +7828,7 @@ ov83_02231494: ; 0x02231494 bl sub_0202E4F0 ldr r0, _022314B0 ; =ov83_0223B888 ldr r0, [r0, #8] - bl FreeToHeap + bl Heap_Free bl sub_02033ED0 ldr r0, _022314B0 ; =ov83_0223B888 mov r1, #0 @@ -7919,7 +7919,7 @@ _0223153C: bl ov83_02239D98 add r1, r0, #0 mov r0, #0x56 - bl AllocFromHeap + bl Heap_Alloc add r2, r0, #0 ldr r0, _022315C0 ; =ov83_0223B888 ldr r1, _022315C4 ; =ov83_02231440 @@ -9395,7 +9395,7 @@ ov83_022320D8: ; 0x022320D8 add r3, r6, #0 bl BG_LoadScreenTilemapData add r0, r7, #0 - bl FreeToHeap + bl Heap_Free add sp, #8 pop {r3, r4, r5, r6, r7, pc} nop @@ -9696,7 +9696,7 @@ _02232312: ldr r0, [r4, r0] bl sub_02020248 ldr r0, [sp, #0x14] - bl FreeToHeap + bl Heap_Free _0223237C: ldr r0, [sp, #8] add r6, r6, #1 @@ -9726,7 +9726,7 @@ ov83_022323A8: ; 0x022323A8 mov r0, #3 mov r1, #0x57 lsl r2, r2, #0x10 - bl CreateHeap + bl Heap_Create ldr r1, _0223240C ; =0x00003CF4 add r0, r4, #0 mov r2, #0x57 @@ -9759,7 +9759,7 @@ ov83_022323A8: ; 0x022323A8 mov r0, #0 mov r1, #0x5b lsl r2, r2, #8 - bl CreateHeap + bl Heap_Create mov r0, #1 pop {r4, pc} .align 2, 0 @@ -11361,16 +11361,16 @@ _02233104: bl FreeBgTilemapBuffer ldr r0, _0223315C ; =0x0000299C ldr r0, [r7, r0] - bl FreeToHeap + bl Heap_Free ldr r0, _02233160 ; =SDK_OVERLAY_OVERLAY_83_ID ldr r1, _02233164 ; =ov83_0223A434 bl RegisterMainOverlay mov r0, #0x5b - bl DestroyHeap + bl Heap_Destroy ldr r0, [sp] bl OverlayManager_FreeData mov r0, #0x57 - bl DestroyHeap + bl Heap_Destroy mov r0, #1 pop {r3, r4, r5, r6, r7, pc} nop @@ -11390,7 +11390,7 @@ ov83_02233168: ; 0x02233168 bl ov83_022331E0 ldr r1, _022331B4 ; =0x00003CF4 add r0, r5, #0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd ldr r2, _022331B4 ; =0x00003CF4 mov r1, #0 add r4, r0, #0 @@ -11412,7 +11412,7 @@ ov83_02233168: ; 0x02233168 mov r1, #1 bl ov83_02231DF0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, r6, r7, pc} nop _022331B4: .word 0x00003CF4 @@ -15963,7 +15963,7 @@ ov83_022352FC: ; 0x022352FC add r0, r3, #0 lsl r1, r1, #0xc add r7, r2, #0 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r4, r0, #0 beq _02235330 add r1, r5, #0 @@ -15975,7 +15975,7 @@ ov83_022352FC: ; 0x022352FC cmp r0, #0 bne _02235330 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #0 pop {r3, r4, r5, r6, r7, pc} _02235330: @@ -16110,7 +16110,7 @@ ov83_022353C0: ; 0x022353C0 add r1, #8 bl sub_02020248 add r0, r6, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov83_022353C0 @@ -16227,7 +16227,7 @@ ov83_022354F0: ; 0x022354F0 str r0, [sp, #0xc] mov r0, #0x4e lsl r1, r1, #0xc - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd mov r6, #0 str r0, [sp, #0x10] add r7, r6, #0 @@ -16348,7 +16348,7 @@ _02235602: cmp r6, #0x1e blt _02235512 ldr r0, [sp, #0x10] - bl FreeToHeap + bl Heap_Free ldr r0, [sp, #0xc] bl NARC_Delete ldr r1, _02235640 ; =ov83_022354AC @@ -18509,7 +18509,7 @@ ov83_02236764: ; 0x02236764 mov r0, #3 mov r1, #0x4e lsl r2, r2, #0xe - bl CreateHeap + bl Heap_Create ldr r1, _022367F0 ; =0x00012608 add r0, r5, #0 mov r2, #0x4e @@ -19280,14 +19280,14 @@ ov83_02236DD0: ; 0x02236DD0 add r4, r0, #0 bl OverlayManager_GetData ldr r0, [r0, #0x20] - bl FreeToHeap + bl Heap_Free ldr r0, _02236DFC ; =SDK_OVERLAY_OVERLAY_63_ID ldr r1, _02236E00 ; =ov63_021DBAB8 bl RegisterMainOverlay add r0, r4, #0 bl OverlayManager_FreeData mov r0, #0x4e - bl DestroyHeap + bl Heap_Destroy mov r0, #0 bl ov83_02239450 mov r0, #1 @@ -22615,12 +22615,12 @@ _02238604: .word heap_id ov83_Alloc: ; 0x02238608 add r1, r0, #0 ldr r0, _02238614 ; =heap_id - ldr r3, _02238618 ; =AllocFromHeap + ldr r3, _02238618 ; =Heap_Alloc ldr r0, [r0] bx r3 nop _02238614: .word heap_id -_02238618: .word AllocFromHeap +_02238618: .word Heap_Alloc thumb_func_end ov83_Alloc thumb_func_start ov83_0223861C @@ -22669,7 +22669,7 @@ _02238652: mov r0, #0 bl CTRDG_Enable ldr r0, _022386C0 ; =ov83_Alloc - ldr r1, _022386C4 ; =FreeToHeap + ldr r1, _022386C4 ; =Heap_Free bl SetCustomAllocatorAndDestructor ldr r1, _022386B8 ; =0x000004A8 ldr r3, _022386C8 ; =ov83_0223A6B4 @@ -22701,7 +22701,7 @@ _022386B4: .word ov83_0223B69C _022386B8: .word 0x000004A8 _022386BC: .word 0x08020000 _022386C0: .word ov83_Alloc -_022386C4: .word FreeToHeap +_022386C4: .word Heap_Free _022386C8: .word ov83_0223A6B4 thumb_func_end ov83_0223861C @@ -22827,7 +22827,7 @@ ov83_022387A0: ; 0x022387A0 add r6, r1, #0 mov r0, #3 add r2, r3, #0 - bl CreateHeap + bl Heap_Create add r0, r5, #0 add r1, r4, #0 add r2, r6, #0 @@ -24232,7 +24232,7 @@ ov83_022391EC: ; 0x022391EC lsl r3, r3, #8 bl BG_LoadScreenTilemapData ldr r0, [sp, #0x10] - bl FreeToHeap + bl Heap_Free mov r0, #0x20 str r0, [sp] mov r0, #0x18 @@ -24322,7 +24322,7 @@ ov83_022392EC: ; 0x022392EC add r0, r2, #0 lsl r1, r1, #8 str r2, [sp] - bl AllocFromHeap + bl Heap_Alloc ldr r1, _0223936C ; =0x0000A001 add r4, r0, #0 bl MATHi_CRC16InitTableRev @@ -24332,7 +24332,7 @@ ov83_022392EC: ; 0x022392EC bl MATH_CalcCRC16 add r6, r0, #0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add r0, sp, #4 bl OS_GetMacAddress add r0, sp, #4 @@ -24354,7 +24354,7 @@ _0223932E: mov r1, #0x41 ldr r0, [sp] lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc add r1, sp, #4 mov r2, #8 add r4, r0, #0 @@ -24367,7 +24367,7 @@ _0223932E: add r3, r7, #0 bl sub_020952AC add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0xc pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -24385,7 +24385,7 @@ ov83_02239374: ; 0x02239374 add r0, r2, #0 lsl r1, r1, #8 str r2, [sp] - bl AllocFromHeap + bl Heap_Alloc ldr r1, _0223940C ; =0x0000A001 add r4, r0, #0 bl MATHi_CRC16InitTableRev @@ -24395,7 +24395,7 @@ ov83_02239374: ; 0x02239374 bl MATH_CalcCRC16 add r6, r0, #0 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #0 bl sub_0202EF18 ldrb r2, [r0, #4] @@ -24429,7 +24429,7 @@ _022393CE: mov r1, #0x41 ldr r0, [sp] lsl r1, r1, #2 - bl AllocFromHeap + bl Heap_Alloc add r1, sp, #4 mov r2, #8 add r4, r0, #0 @@ -24442,7 +24442,7 @@ _022393CE: add r3, r7, #0 bl sub_020952AC add r0, r4, #0 - bl FreeToHeap + bl Heap_Free add sp, #0xc pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -25751,7 +25751,7 @@ ov83_02239DC0: ; 0x02239DC0 bic r1, r0 add r1, #0x20 mov r0, #0x56 - bl AllocFromHeap + bl Heap_Alloc add r2, r0, #0 add r2, #0x20 mov r1, #0x1f @@ -25769,7 +25769,7 @@ ov83_02239DE0: ; 0x02239DE0 beq _02239DEE sub r0, r1, #4 ldr r0, [r0] - bl FreeToHeap + bl Heap_Free _02239DEE: pop {r3, pc} thumb_func_end ov83_02239DE0 diff --git a/arm9/overlays/84/asm/overlay_84_thumb1.s b/arm9/overlays/84/asm/overlay_84_thumb1.s index 25e230385..e6d386b4f 100644 --- a/arm9/overlays/84/asm/overlay_84_thumb1.s +++ b/arm9/overlays/84/asm/overlay_84_thumb1.s @@ -25,7 +25,7 @@ _021D74FC: mov r0, #3 mov r1, #0x4b lsl r2, r0, #0x10 - bl CreateHeap + bl Heap_Create ldr r1, _021D7670 ; =0x00001244 add r0, r6, #0 mov r2, #0x4b @@ -269,7 +269,7 @@ _021D772E: add r0, r6, #0 bl OverlayManager_FreeData mov r0, #0x4b - bl DestroyHeap + bl Heap_Destroy mov r0, #1 pop {r4, r5, r6, pc} _021D773E: @@ -697,7 +697,7 @@ ov84_021D7A84: ; 0x021D7A84 mov r1, #5 bl FreeBgTilemapBuffer ldr r0, [r4, #4] - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov84_021D7A84 @@ -934,7 +934,7 @@ ov84_021D7BC8: ; 0x021D7BC8 add r0, #0x6c mov r1, #0x4b mov r2, #0x20 - bl GF_ExpHeap_FndInitAllocator + bl HeapExp_FndInitAllocator ldr r0, [r4, #4] mov r1, #0 bl NNS_G3dGetAnmByIdx @@ -983,12 +983,12 @@ ov84_021D7CD4: ; 0x021D7CD4 add r0, #0x6c bl NNS_G3dFreeAnmObj ldr r0, [r4, #4] - bl FreeToHeap + bl Heap_Free _021D7CF0: ldr r0, [r4] cmp r0, #0 beq _021D7CFA - bl FreeToHeap + bl Heap_Free _021D7CFA: pop {r4, pc} thumb_func_end ov84_021D7CD4 @@ -1118,7 +1118,7 @@ ov84_021D7DF4: ; 0x021D7DF4 add r4, #0x38 cmp r0, #0 beq _021D7E08 - bl FreeToHeap + bl Heap_Free _021D7E08: ldr r1, _021D7ED4 ; =0x021DA648 lsl r3, r5, #1 @@ -1381,7 +1381,7 @@ ov84_021D801C: ; 0x021D801C mov r1, #0x30 str r2, [sp] add r6, r3, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _021D8090 ldr r0, [sp] diff --git a/arm9/overlays/84/asm/overlay_84_thumb2.s b/arm9/overlays/84/asm/overlay_84_thumb2.s index 93e4f4774..cc0577edc 100644 --- a/arm9/overlays/84/asm/overlay_84_thumb2.s +++ b/arm9/overlays/84/asm/overlay_84_thumb2.s @@ -81,10 +81,10 @@ _021D81CE: thumb_func_start ov84_021D81D4 ov84_021D81D4: ; 0x021D81D4 - ldr r3, _021D81D8 ; =FreeToHeap + ldr r3, _021D81D8 ; =Heap_Free bx r3 .align 2, 0 -_021D81D8: .word FreeToHeap +_021D81D8: .word Heap_Free thumb_func_end ov84_021D81D4 thumb_func_start ov84_021D81DC @@ -95,7 +95,7 @@ ov84_021D81DC: ; 0x021D81DC mov r0, #0x4b mov r1, #0x10 add r7, r2, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _021D8218 mov r0, #0x4b @@ -129,15 +129,15 @@ ov84_021D821C: ; 0x021D821C ldr r0, [r4] cmp r0, #0 beq _021D822C - bl FreeToHeap + bl Heap_Free _021D822C: ldr r0, [r4, #4] cmp r0, #0 beq _021D8236 - bl FreeToHeap + bl Heap_Free _021D8236: add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _021D823C: pop {r4, pc} .align 2, 0 @@ -534,7 +534,7 @@ ov84_021D84F8: ; 0x021D84F8 mov r1, #0x38 add r5, r2, #0 add r7, r3, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _021D85AC ldr r0, [sp, #0x14] @@ -630,11 +630,11 @@ _021D85C6: ldr r0, [r4, #0x28] bl RemoveWindow ldr r0, [r4, #0x24] - bl FreeToHeap + bl Heap_Free ldr r0, [r4, #0x28] - bl FreeToHeap + bl Heap_Free add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov84_021D85B8 @@ -973,7 +973,7 @@ ov84_021D8874: ; 0x021D8874 add r6, r1, #0 mov r0, #0x4b mov r1, #0x1c - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _021D88A0 str r5, [r4] @@ -1019,7 +1019,7 @@ ov84_021D88C8: ; 0x021D88C8 add r4, r0, #0 bl ov84_021D8A74 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #1 pop {r4, pc} .align 2, 0 @@ -1253,7 +1253,7 @@ ov84_021D8A8C: ; 0x021D8A8C add r4, r1, #0 mov r0, #0x4b mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc cmp r0, #0 beq _021D8AA8 str r5, [r0] @@ -1286,7 +1286,7 @@ ov84_021D8AC0: ; 0x021D8AC0 add r4, r0, #0 bl ov84_021D8C3C add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #1 pop {r4, pc} .align 2, 0 @@ -1502,7 +1502,7 @@ ov84_021D8C54: ; 0x021D8C54 add r5, r0, #0 mov r0, #0x4b lsl r1, r1, #8 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _021D8CC6 str r5, [r4] @@ -1582,7 +1582,7 @@ ov84_021D8CEC: ; 0x021D8CEC add r0, r4, #0 bl ov84_021D9044 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #1 pop {r4, pc} .align 2, 0 @@ -1934,7 +1934,7 @@ _021D8FA6: cmp r6, #6 blt _021D8FA6 ldr r0, [sp, #0x18] - bl FreeToHeap + bl Heap_Free _021D8FC8: ldr r0, [sp, #0x14] ldr r0, [r0] @@ -2023,7 +2023,7 @@ _021D906A: cmp r0, #0 beq _021D9082 bl sub_0201B6C8 - bl FreeToHeap + bl Heap_Free mov r0, #0x15 lsl r0, r0, #4 ldr r0, [r5, r0] @@ -2069,7 +2069,7 @@ ov84_021D90C4: ; 0x021D90C4 add r6, r1, #0 mov r0, #0x4b mov r1, #0x38 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021D90DA b _021D91F6 @@ -2412,7 +2412,7 @@ ov84_021D9394: ; 0x021D9394 add r4, r1, #0 mov r0, #0x4b mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc cmp r0, #0 beq _021D93B0 str r5, [r0] @@ -2445,7 +2445,7 @@ ov84_021D93C8: ; 0x021D93C8 add r4, r0, #0 bl ov84_021D9544 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #1 pop {r4, pc} .align 2, 0 @@ -2660,7 +2660,7 @@ ov84_021D955C: ; 0x021D955C add r6, r1, #0 mov r0, #0x4b mov r1, #0x6c - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _021D958E str r5, [r4] @@ -2710,7 +2710,7 @@ ov84_021D95B8: ; 0x021D95B8 add r4, r0, #0 bl ov84_021D9A04 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #1 pop {r4, pc} .align 2, 0 @@ -3285,7 +3285,7 @@ ov84_021D9A54: ; 0x021D9A54 add r4, r1, #0 mov r0, #0x4b mov r1, #0x10 - bl AllocFromHeap + bl Heap_Alloc cmp r0, #0 beq _021D9A70 str r5, [r0] @@ -3318,7 +3318,7 @@ ov84_021D9A88: ; 0x021D9A88 add r4, r0, #0 bl ov84_021D9C04 add r0, r4, #0 - bl FreeToHeap + bl Heap_Free mov r0, #1 pop {r4, pc} .align 2, 0 @@ -3533,7 +3533,7 @@ ov84_021D9C1C: ; 0x021D9C1C add r6, r1, #0 mov r0, #0x4b mov r1, #0xf4 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _021D9C7C str r5, [r4] @@ -3610,10 +3610,10 @@ ov84_021D9CA4: ; 0x021D9CA4 ldr r0, [r5, #0x58] cmp r0, #0 beq _021D9CC4 - bl FreeToHeap + bl Heap_Free _021D9CC4: add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl OS_RestoreInterrupts mov r0, #1 @@ -4723,7 +4723,7 @@ ov84_021DA58C: ; 0x021DA58C mov r1, #0x1c add r7, r2, #0 str r3, [sp] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 beq _021DA5CE mov r0, #0 @@ -4743,7 +4743,7 @@ ov84_021DA58C: ; 0x021DA58C add r5, r0, #0 bne _021DA5CA add r0, r4, #0 - bl FreeToHeap + bl Heap_Free _021DA5CA: add r0, r5, #0 pop {r3, r4, r5, r6, r7, pc} @@ -4760,7 +4760,7 @@ ov84_021DA5D8: ; 0x021DA5D8 add r4, r0, #0 beq _021DA5EC bl sub_0201B6C8 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 bl SysTask_Destroy _021DA5EC: diff --git a/arm9/overlays/85/asm/overlay_85.s b/arm9/overlays/85/asm/overlay_85.s index f8c6f20aa..02d23056f 100644 --- a/arm9/overlays/85/asm/overlay_85.s +++ b/arm9/overlays/85/asm/overlay_85.s @@ -18,7 +18,7 @@ ov85_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x4f lsl r2, r2, #0x12 - bl CreateHeap + bl Heap_Create add r0, r5, #0 mov r1, #8 mov r2, #0x4f @@ -193,7 +193,7 @@ ov85_021D7644: ; 0x021D7644 add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0x4f - bl DestroyHeap + bl Heap_Destroy mov r0, #1 pop {r4, r5, r6, pc} .align 2, 0 @@ -252,10 +252,10 @@ _021D76F0: .word 0x000004C4 thumb_func_start ov85_021D76F4 ov85_021D76F4: ; 0x021D76F4 - ldr r3, _021D76F8 ; =FreeToHeap + ldr r3, _021D76F8 ; =Heap_Free bx r3 .align 2, 0 -_021D76F8: .word FreeToHeap +_021D76F8: .word Heap_Free thumb_func_end ov85_021D76F4 thumb_func_start ov85_021D76FC @@ -513,7 +513,7 @@ ov85_021D7904: ; 0x021D7904 mov r1, #7 bl FreeBgTilemapBuffer add r0, r4, #0 - bl FreeToHeap + bl Heap_Free pop {r4, pc} .align 2, 0 thumb_func_end ov85_021D7904 @@ -580,7 +580,7 @@ ov85_021D797C: ; 0x021D797C mov r3, #0 bl BG_LoadPlttData add r0, r5, #0 - bl FreeToHeap + bl Heap_Free mov r1, #0 add r0, r4, #0 add r2, r1, #0 @@ -600,7 +600,7 @@ ov85_021D797C: ; 0x021D797C mov r1, #1 bl BG_LoadCharTilesData add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 mov r1, #1 mov r2, #0 @@ -625,7 +625,7 @@ ov85_021D797C: ; 0x021D797C ldr r0, [r4, r0] bl BgCommitTilemapBufferToVram add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 mov r1, #8 mov r2, #0 @@ -645,7 +645,7 @@ ov85_021D797C: ; 0x021D797C mov r1, #2 bl BG_LoadCharTilesData add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 mov r1, #9 mov r2, #0 @@ -670,7 +670,7 @@ ov85_021D797C: ; 0x021D797C ldr r0, [r4, r0] bl BgCommitTilemapBufferToVram add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 mov r1, #3 mov r2, #0 @@ -688,7 +688,7 @@ ov85_021D797C: ; 0x021D797C mov r3, #0 bl BG_LoadPlttData add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 mov r1, #2 mov r2, #0 @@ -708,7 +708,7 @@ ov85_021D797C: ; 0x021D797C mov r1, #7 bl BG_LoadCharTilesData add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r4, #0 mov r1, #4 mov r2, #0 @@ -733,7 +733,7 @@ ov85_021D797C: ; 0x021D797C ldr r0, [r4, r0] bl BgCommitTilemapBufferToVram add r0, r5, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, pc} .align 2, 0 _021D7B1C: .word 0x00000448 @@ -1474,7 +1474,7 @@ ov85_021D80F8: ; 0x021D80F8 add r5, r0, #0 mov r0, #0x4f add r1, r5, #0 - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021D810C bl GF_AssertFail @@ -1526,11 +1526,11 @@ ov85_021D8144: ; 0x021D8144 cmp r5, #1 bne _021D8162 mov r0, #0x4f - bl AllocFromHeap + bl Heap_Alloc b _021D8168 _021D8162: mov r0, #0x4f - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd _021D8168: add r5, r0, #0 cmp r5, #0 @@ -8620,7 +8620,7 @@ ov85_021DB494: ; 0x021DB494 add r2, r4, r2 bl ov85_021DB604 add r0, r6, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 mov r1, #5 mov r2, #0 @@ -8634,7 +8634,7 @@ ov85_021DB494: ; 0x021DB494 add r2, #0x24 bl ov85_021DB604 add r0, r6, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 mov r1, #6 mov r2, #0 @@ -8648,7 +8648,7 @@ ov85_021DB494: ; 0x021DB494 add r2, #0x44 bl ov85_021DB604 add r0, r6, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 mov r1, #7 mov r2, #0 @@ -8662,7 +8662,7 @@ ov85_021DB494: ; 0x021DB494 add r2, #0x64 bl ov85_021DB604 add r0, r6, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 mov r1, #0x4a mov r2, #0 @@ -8677,7 +8677,7 @@ ov85_021DB494: ; 0x021DB494 add r2, r4, r2 bl ov85_021DB604 add r0, r6, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 mov r1, #0x4b mov r2, #0 @@ -8698,7 +8698,7 @@ ov85_021DB494: ; 0x021DB494 add r2, r4, r2 bl ov85_021DB604 add r0, r6, #0 - bl FreeToHeap + bl Heap_Free add r0, r5, #0 mov r1, #0x4c mov r2, #0 @@ -8719,7 +8719,7 @@ ov85_021DB494: ; 0x021DB494 add r2, r4, r2 bl ov85_021DB604 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add sp, #4 pop {r3, r4, r5, r6, pc} thumb_func_end ov85_021DB494 @@ -9462,7 +9462,7 @@ ov85_021DBB0C: ; 0x021DBB0C add r4, r0, #0 mov r0, #0x4f mov r1, #0x10 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r1, r0, #0 mov r0, #0 str r0, [r1] @@ -9482,7 +9482,7 @@ ov85_021DBB30: ; 0x021DBB30 add r4, r0, #0 mov r0, #0x4f mov r1, #0x10 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r1, r0, #0 mov r0, #0 str r0, [r1] @@ -9503,7 +9503,7 @@ ov85_021DBB54: ; 0x021DBB54 add r4, r1, #0 mov r0, #0x4f mov r1, #0x10 - bl AllocFromHeapAtEnd + bl Heap_AllocAtEnd add r1, r0, #0 mov r0, #0 str r0, [r1] @@ -9567,7 +9567,7 @@ _021DBBB8: bne _021DBBE6 _021DBBDA: add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r7, #0 bl SysTask_Destroy _021DBBE6: @@ -9618,7 +9618,7 @@ _021DBC18: bne _021DBC46 _021DBC3A: add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r7, #0 bl SysTask_Destroy _021DBC46: @@ -9641,7 +9641,7 @@ ov85_021DBC48: ; 0x021DBC48 cmp r3, #0x3f bne _021DBC70 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r7, #0 bl SysTask_Destroy pop {r3, r4, r5, r6, r7, pc} @@ -9714,7 +9714,7 @@ _021DBCD8: cmp r4, #0 bne _021DBCFE add r0, r5, #0 - bl FreeToHeap + bl Heap_Free add r0, r7, #0 bl SysTask_Destroy _021DBCFE: @@ -15185,7 +15185,7 @@ ov85_021DE5A4: ; 0x021DE5A4 add r7, r3, #0 ldr r5, [sp, #0x20] ldr r6, [sp, #0x24] - bl AllocFromHeap + bl Heap_Alloc add r4, r0, #0 bne _021DE5C8 bl GF_AssertFail @@ -15250,26 +15250,26 @@ _021DE5C8: str r0, [r4, r1] ldr r0, [sp] lsl r1, r7, #3 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x53 lsl r1, r1, #2 str r0, [r4, r1] ldr r0, [sp] lsl r1, r5, #3 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x15 lsl r1, r1, #4 str r0, [r4, r1] ldr r0, [sp] lsl r1, r6, #3 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x55 lsl r1, r1, #2 str r0, [r4, r1] ldr r1, [sp, #0x28] ldr r0, [sp] lsl r1, r1, #3 - bl AllocFromHeap + bl Heap_Alloc mov r1, #0x56 lsl r1, r1, #2 str r0, [r4, r1] @@ -15468,19 +15468,19 @@ _021DE7BC: mov r0, #0x53 lsl r0, r0, #2 ldr r0, [r5, r0] - bl FreeToHeap + bl Heap_Free mov r0, #0x15 lsl r0, r0, #4 ldr r0, [r5, r0] - bl FreeToHeap + bl Heap_Free mov r0, #0x55 lsl r0, r0, #2 ldr r0, [r5, r0] - bl FreeToHeap + bl Heap_Free mov r0, #0x56 lsl r0, r0, #2 ldr r0, [r5, r0] - bl FreeToHeap + bl Heap_Free bl sub_0201C29C mov r0, #0x4e lsl r0, r0, #2 @@ -15491,7 +15491,7 @@ _021DE7BC: ldr r0, [r5, #0xc] bl sub_0201FD58 add r0, r5, #0 - bl FreeToHeap + bl Heap_Free pop {r3, r4, r5, r6, r7, pc} .align 2, 0 thumb_func_end ov85_021DE710 diff --git a/arm9/overlays/86/asm/overlay_86.s b/arm9/overlays/86/asm/overlay_86.s index 238e143b6..f63e3f84e 100644 --- a/arm9/overlays/86/asm/overlay_86.s +++ b/arm9/overlays/86/asm/overlay_86.s @@ -11,7 +11,7 @@ ov86_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x54 lsl r2, r2, #0x10 - bl CreateHeap + bl Heap_Create add r0, r5, #0 mov r1, #0x44 mov r2, #0x54 @@ -233,7 +233,7 @@ ov86_021D76B0: ; 0x021D76B0 add r0, r5, #0 bl OverlayManager_FreeData add r0, r4, #0 - bl DestroyHeap + bl Heap_Destroy mov r0, #1 pop {r4, r5, r6, pc} .align 2, 0 @@ -457,7 +457,7 @@ ov86_021D7858: ; 0x021D7858 mov r1, #7 bl FreeBgTilemapBuffer ldr r0, [r4, #0x10] - bl FreeToHeap + bl Heap_Free pop {r4, pc} thumb_func_end ov86_021D7858 diff --git a/arm9/src/bag.c b/arm9/src/bag.c index b108276f1..33bc06c12 100644 --- a/arm9/src/bag.c +++ b/arm9/src/bag.c @@ -8,11 +8,11 @@ #include "heap.h" #include "itemtool.h" -static u32 Bag_GetItemPocket(Bag *bag, u16 itemId, ItemSlot **itemSlots, u32 *countPtr, HeapID heapId); +static u32 Bag_GetItemPocket(Bag *bag, u16 itemId, ItemSlot **itemSlots, u32 *countPtr, enum HeapID heapID); static ItemSlot *Pocket_GetItemSlotForAdd(ItemSlot *slots, u32 count, u16 itemId, u16 quantity, u16 maxQuantity); -static ItemSlot *Bag_GetItemSlotForAdd(Bag *bag, u16 itemId, u16 quantity, HeapID heapId); +static ItemSlot *Bag_GetItemSlotForAdd(Bag *bag, u16 itemId, u16 quantity, enum HeapID heapID); static ItemSlot *Pocket_GetItemSlotForRemove(ItemSlot *slots, u32 count, u16 itemId, u16 quantity); -static ItemSlot *Bag_GetItemSlotForRemove(Bag *bag, u16 itemId, u16 quantity, HeapID heapId); +static ItemSlot *Bag_GetItemSlotForRemove(Bag *bag, u16 itemId, u16 quantity, enum HeapID heapID); static void SwapItemSlots(ItemSlot *a, ItemSlot *b); static void PocketCompaction(ItemSlot *slots, u32 count); static void SortPocket(ItemSlot *slots, u32 count); @@ -21,8 +21,8 @@ u32 Save_Bag_sizeof(void) { return sizeof(Bag); } -Bag *Save_Bag_New(HeapID heapId) { - Bag *bag = (Bag *)AllocFromHeap(heapId, sizeof(Bag)); +Bag *Save_Bag_New(enum HeapID heapID) { + Bag *bag = (Bag *)Heap_Alloc(heapID, sizeof(Bag)); Save_Bag_Init(bag); return bag; } @@ -43,8 +43,8 @@ void Bag_SetRegisteredItem(Bag *bag, u32 item) { bag->registeredItem = item; } -static u32 Bag_GetItemPocket(Bag *bag, u16 itemId, ItemSlot **itemSlots, u32 *countPtr, HeapID heapId) { - u32 pocket = GetItemAttr(itemId, ITEMATTR_POCKET, heapId); +static u32 Bag_GetItemPocket(Bag *bag, u16 itemId, ItemSlot **itemSlots, u32 *countPtr, enum HeapID heapID) { + u32 pocket = GetItemAttr(itemId, ITEMATTR_POCKET, heapID); switch (pocket) { case POCKET_KEY_ITEMS: *itemSlots = bag->keyItems; @@ -105,10 +105,10 @@ static ItemSlot *Pocket_GetItemSlotForAdd(ItemSlot *slots, u32 count, u16 itemId return &slots[found]; } -static ItemSlot *Bag_GetItemSlotForAdd(Bag *bag, u16 itemId, u16 quantity, HeapID heapId) { +static ItemSlot *Bag_GetItemSlotForAdd(Bag *bag, u16 itemId, u16 quantity, enum HeapID heapID) { ItemSlot *slots; u32 count; - u32 pocket = Bag_GetItemPocket(bag, itemId, &slots, &count, heapId); + u32 pocket = Bag_GetItemPocket(bag, itemId, &slots, &count, heapID); if (pocket == POCKET_TMHMS) { return Pocket_GetItemSlotForAdd(slots, count, itemId, quantity, BAG_TMHM_QUANTITY_MAX); } else { @@ -116,19 +116,19 @@ static ItemSlot *Bag_GetItemSlotForAdd(Bag *bag, u16 itemId, u16 quantity, HeapI } } -BOOL Bag_HasSpaceForItem(Bag *bag, u16 itemId, u16 quantity, HeapID heapId) { - return Bag_GetItemSlotForAdd(bag, itemId, quantity, heapId) != NULL; +BOOL Bag_HasSpaceForItem(Bag *bag, u16 itemId, u16 quantity, enum HeapID heapID) { + return Bag_GetItemSlotForAdd(bag, itemId, quantity, heapID) != NULL; } -BOOL Bag_AddItem(Bag *bag, u16 itemId, u16 quantity, HeapID heapId) { - ItemSlot *slot = Bag_GetItemSlotForAdd(bag, itemId, quantity, heapId); +BOOL Bag_AddItem(Bag *bag, u16 itemId, u16 quantity, enum HeapID heapID) { + ItemSlot *slot = Bag_GetItemSlotForAdd(bag, itemId, quantity, heapID); if (slot == NULL) { return FALSE; } slot->id = itemId; slot->quantity += quantity; u32 count; - u32 pocket = Bag_GetItemPocket(bag, itemId, &slot, &count, heapId); + u32 pocket = Bag_GetItemPocket(bag, itemId, &slot, &count, heapID); if (pocket == POCKET_TMHMS || pocket == POCKET_BERRIES) { SortPocket(slot, count); } @@ -147,15 +147,15 @@ static ItemSlot *Pocket_GetItemSlotForRemove(ItemSlot *slots, u32 count, u16 ite return NULL; } -static ItemSlot *Bag_GetItemSlotForRemove(Bag *bag, u16 itemId, u16 quantity, HeapID heapId) { +static ItemSlot *Bag_GetItemSlotForRemove(Bag *bag, u16 itemId, u16 quantity, enum HeapID heapID) { ItemSlot *slots; u32 count; - Bag_GetItemPocket(bag, itemId, &slots, &count, heapId); + Bag_GetItemPocket(bag, itemId, &slots, &count, heapID); return Pocket_GetItemSlotForRemove(slots, count, itemId, quantity); } -BOOL Bag_TakeItem(Bag *bag, u16 itemId, u16 quantity, HeapID heapId) { - ItemSlot *slot = Bag_GetItemSlotForRemove(bag, itemId, quantity, heapId); +BOOL Bag_TakeItem(Bag *bag, u16 itemId, u16 quantity, enum HeapID heapID) { + ItemSlot *slot = Bag_GetItemSlotForRemove(bag, itemId, quantity, heapID); if (slot == NULL) { return FALSE; } @@ -164,7 +164,7 @@ BOOL Bag_TakeItem(Bag *bag, u16 itemId, u16 quantity, HeapID heapId) { slot->id = ITEM_NONE; } u32 count; - Bag_GetItemPocket(bag, itemId, &slot, &count, heapId); + Bag_GetItemPocket(bag, itemId, &slot, &count, heapID); PocketCompaction(slot, count); return TRUE; } @@ -182,8 +182,8 @@ BOOL Pocket_TakeItem(ItemSlot *slots, u32 count, u16 itemId, u16 quantity) { return TRUE; } -BOOL Bag_HasItem(Bag *bag, u16 itemId, u16 quantity, HeapID heapId) { - return Bag_GetItemSlotForRemove(bag, itemId, quantity, heapId) != NULL; +BOOL Bag_HasItem(Bag *bag, u16 itemId, u16 quantity, enum HeapID heapID) { + return Bag_GetItemSlotForRemove(bag, itemId, quantity, heapID) != NULL; } BOOL Bag_PocketNotEmpty(Bag *bag, u32 pocket) { @@ -234,8 +234,8 @@ BOOL Bag_PocketNotEmpty(Bag *bag, u32 pocket) { return FALSE; } -u16 Bag_GetQuantity(Bag *bag, u16 itemId, HeapID heapId) { - ItemSlot *slot = Bag_GetItemSlotForRemove(bag, itemId, 1, heapId); +u16 Bag_GetQuantity(Bag *bag, u16 itemId, enum HeapID heapID) { + ItemSlot *slot = Bag_GetItemSlotForRemove(bag, itemId, 1, heapID); if (slot == NULL) { return 0; } @@ -276,8 +276,8 @@ static void SortPocket(ItemSlot *slots, u32 count) { } } -BagView *Bag_CreateView(Bag *bag, const u8 *pockets, HeapID heapId) { - BagView *ret = BagView_New(heapId); +BagView *Bag_CreateView(Bag *bag, const u8 *pockets, enum HeapID heapID) { + BagView *ret = BagView_New(heapID); for (u32 i = 0; pockets[i] != POCKET_BAG_VIEW_END; i++) { switch (pockets[i]) { @@ -359,8 +359,8 @@ Bag *Save_Bag_Get(SaveData *saveData) { return SaveArray_Get(saveData, SAVE_BAG); } -BagCursor *BagCursor_New(HeapID heapId) { - BagCursor *ret = AllocFromHeap(heapId, sizeof(BagCursor)); +BagCursor *BagCursor_New(enum HeapID heapID) { + BagCursor *ret = Heap_Alloc(heapID, sizeof(BagCursor)); MI_CpuClear16(ret, sizeof(BagCursor)); return ret; } diff --git a/arm9/src/bag_view.c b/arm9/src/bag_view.c index a341b0dbf..7194c1399 100644 --- a/arm9/src/bag_view.c +++ b/arm9/src/bag_view.c @@ -30,8 +30,8 @@ static u32 GetNumFashionAccessories(SaveData *saveData); static u32 GetNumFashionBackgrounds(SaveData *saveData); static u32 GetNumBattlePoints(SaveData *saveData); -BagView *BagView_New(u8 heapId) { - BagView *ptr = AllocFromHeap((HeapID)heapId, sizeof(BagView)); +BagView *BagView_New(u8 heapID) { + BagView *ptr = Heap_Alloc((enum HeapID)heapID, sizeof(BagView)); memset(ptr, 0, sizeof(BagView)); return ptr; } @@ -117,9 +117,9 @@ static u32 GetNumBattlePoints(SaveData *saveData) { return FrontierData_BattlePointAction(Save_FrontierData_Get(saveData), 0, DATA_GET); } -BOOL TryFormatRegisteredKeyItemUseMessage(SaveData *saveData, String *dest, u32 itemId, HeapID heapId) { - MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_DIRECT, NARC_MSGDATA_MSG, NARC_msg_narc_0007_bin, heapId); - MessageFormat *messageFormat = MessageFormat_New(heapId); +BOOL TryFormatRegisteredKeyItemUseMessage(SaveData *saveData, String *dest, u32 itemId, enum HeapID heapID) { + MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_DIRECT, NARC_MSGDATA_MSG, NARC_msg_narc_0007_bin, heapID); + MessageFormat *messageFormat = MessageFormat_New(heapID); String *string; if (itemId == ITEM_NONE) { @@ -150,27 +150,27 @@ BOOL TryFormatRegisteredKeyItemUseMessage(SaveData *saveData, String *dest, u32 return TRUE; } -void GetItemUseErrorMessage(PlayerProfile *playerProfile, String *dest, u16 itemId, enum ItemUseError code, HeapID heapId) { +void GetItemUseErrorMessage(PlayerProfile *playerProfile, String *dest, u16 itemId, enum ItemUseError code, enum HeapID heapID) { #pragma unused(itemId) MsgData *msgData; switch (code) { case ITEMUSEERROR_NODISMOUNT: // You can’t dismount your Bike here. - msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0007_bin, heapId); + msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0007_bin, heapID); ReadMsgDataIntoString(msgData, narc_0007_00056, dest); DestroyMsgData(msgData); break; case ITEMUSEERROR_NOFOLLOWER: // It can’t be used when you have someone with you. - msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0007_bin, heapId); + msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0007_bin, heapID); ReadMsgDataIntoString(msgData, narc_0007_00111, dest); DestroyMsgData(msgData); break; default: // Rowan’s words echoed... {STRVAR_1 3, 0}! There’s a time and place for everything! But not now. - msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0199_bin, heapId); - MessageFormat *messageFormat = MessageFormat_New(heapId); + msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0199_bin, heapID); + MessageFormat *messageFormat = MessageFormat_New(heapID); String *src = NewString_ReadMsgData(msgData, narc_0199_00036); BufferPlayersName(messageFormat, 0, playerProfile); StringExpandPlaceholders(messageFormat, dest, src); diff --git a/arm9/src/bg_window.c b/arm9/src/bg_window.c index dffbb1faa..c1bafda39 100644 --- a/arm9/src/bg_window.c +++ b/arm9/src/bg_window.c @@ -92,17 +92,17 @@ static void (*const sClearWindowTilemapFuncs[])(Window *) = { // Make a new BgConfig object, which manages the // eight background layers (four on each screen). -BgConfig *BgConfig_Alloc(HeapID heapId) { - BgConfig *ret = AllocFromHeap(heapId, sizeof(BgConfig)); +BgConfig *BgConfig_Alloc(enum HeapID heapID) { + BgConfig *ret = Heap_Alloc(heapID, sizeof(BgConfig)); memset(ret, 0, sizeof(BgConfig)); - ret->heapId = heapId; + ret->heapID = heapID; ret->scrollScheduled = 0; // redundant to above memset ret->bufferTransferScheduled = 0; // redundant to above memset return ret; } -HeapID BgConfig_GetHeapId(BgConfig *bgConfig) { - return bgConfig->heapId; +enum HeapID BgConfig_GetHeapId(BgConfig *bgConfig) { + return bgConfig->heapID; } void SetBothScreensModesAndDisable(const GraphicsModes *modes) { @@ -237,7 +237,7 @@ void InitBgFromTemplate(BgConfig *bgConfig, u8 bgId, const BgTemplate *template, bgConfig->bgs[bgId].centerY = 0; if (template->bufferSize != 0) { - bgConfig->bgs[bgId].tilemapBuffer = AllocFromHeap(bgConfig->heapId, template->bufferSize); + bgConfig->bgs[bgId].tilemapBuffer = Heap_Alloc(bgConfig->heapID, template->bufferSize); MI_CpuClear16(bgConfig->bgs[bgId].tilemapBuffer, template->bufferSize); @@ -525,7 +525,7 @@ static void GetBgScreenDimensions(u32 screenSize, u8 *widthPtr, u8 *heightPtr) { void FreeBgTilemapBuffer(BgConfig *bgConfig, u8 bgId) { if (bgConfig->bgs[bgId].tilemapBuffer != NULL) { - FreeToHeap(bgConfig->bgs[bgId].tilemapBuffer); + Heap_Free(bgConfig->bgs[bgId].tilemapBuffer); bgConfig->bgs[bgId].tilemapBuffer = NULL; } } @@ -733,10 +733,10 @@ void BgCopyOrUncompressTilemapBufferRangeToVram(BgConfig *bgConfig, u8 bgId, con } u32 uncompSize = MI_GetUncompressedSize(buffer); - void *ptr = AllocFromHeapAtEnd(bgConfig->heapId, uncompSize); + void *ptr = Heap_AllocAtEnd(bgConfig->heapID, uncompSize); CopyOrUncompressTilemapData(buffer, ptr, bufferSize); LoadBgVramScr(bgId, ptr, baseTile * 2, uncompSize); - FreeToHeap(ptr); + Heap_Free(ptr); return; } @@ -788,10 +788,10 @@ void BG_LoadCharTilesData(BgConfig *bgConfig, u8 bgId, const void *data, u32 siz static void BG_LoadCharPixelData(BgConfig *bgConfig, u8 bgId, const void *buffer, u32 size, u32 offset) { if (size == 0) { u32 uncompressedSize = MI_GetUncompressedSize(buffer); - void *uncompressedBuffer = AllocFromHeapAtEnd(bgConfig->heapId, uncompressedSize); + void *uncompressedBuffer = Heap_AllocAtEnd(bgConfig->heapID, uncompressedSize); CopyOrUncompressTilemapData(buffer, uncompressedBuffer, size); LoadBgVramChar(bgId, uncompressedBuffer, offset, uncompressedSize); - FreeToHeap(uncompressedBuffer); + Heap_Free(uncompressedBuffer); return; } @@ -828,19 +828,19 @@ static void LoadBgVramChar(u8 bgId, const void *data, u32 offset, u32 size) { } } -void BG_ClearCharDataRange(u8 bgId, u32 size, u32 offset, HeapID heapId) { - void *buffer = AllocFromHeapAtEnd(heapId, size); +void BG_ClearCharDataRange(u8 bgId, u32 size, u32 offset, enum HeapID heapID) { + void *buffer = Heap_AllocAtEnd(heapID, size); memset(buffer, 0, size); LoadBgVramChar(bgId, buffer, offset, size); - FreeToHeapExplicit(heapId, buffer); + Heap_FreeExplicit(heapID, buffer); } void BG_FillCharDataRange(BgConfig *bgConfig, enum GFBgLayer bgId, u32 fillValue, u32 ntiles, u32 offset) { void *buffer; u32 size = ntiles * bgConfig->bgs[bgId].tileSize; u32 value = fillValue; - buffer = AllocFromHeapAtEnd(bgConfig->heapId, size); + buffer = Heap_AllocAtEnd(bgConfig->heapID, size); if (bgConfig->bgs[bgId].tileSize == TILE_SIZE_4BPP) { value = (value << 12) | (value << 8) | (value << 4) | (value << 0); @@ -852,7 +852,7 @@ void BG_FillCharDataRange(BgConfig *bgConfig, enum GFBgLayer bgId, u32 fillValue MI_CpuFillFast(buffer, value, size); LoadBgVramChar((u8)bgId, buffer, bgConfig->bgs[bgId].tileSize * offset, size); - FreeToHeap(buffer); + Heap_Free(buffer); } void BG_LoadPlttData(u32 location, void *plttData, u32 size, enum GFPalSlotOffset offset) { @@ -1189,8 +1189,8 @@ static void Convert4bppTo8bppInternal(u8 *src4bpp, u32 size, u8 *dest8bpp, u8 pa } } -u8 *Convert4bppTo8bpp(u8 *src4Bpp, u32 size, u8 paletteNum, HeapID heapId) { - u8 *ptr = (u8 *)AllocFromHeap(heapId, size * 2); +u8 *Convert4bppTo8bpp(u8 *src4Bpp, u32 size, u8 paletteNum, enum HeapID heapID) { + u8 *ptr = (u8 *)Heap_Alloc(heapID, size * 2); Convert4bppTo8bppInternal(src4Bpp, size, ptr, paletteNum); @@ -1408,8 +1408,8 @@ void FillBitmapRect8Bit(const Bitmap *surface, u16 x, u16 y, u16 width, u16 heig } } -Window *AllocWindows(HeapID heapId, s32 num) { - Window *ret = AllocFromHeap(heapId, num * sizeof(Window)); +Window *AllocWindows(enum HeapID heapID, s32 num) { + Window *ret = Heap_Alloc(heapID, num * sizeof(Window)); for (u16 i = 0; i < num; i++) { InitWindow(&ret[i]); } @@ -1442,7 +1442,7 @@ void AddWindowParameterized(BgConfig *bgConfig, Window *window, u8 bgId, u8 x, u return; } - void *buffer = AllocFromHeap(bgConfig->heapId, width * height * bgConfig->bgs[bgId].tileSize); + void *buffer = Heap_Alloc(bgConfig->heapID, width * height * bgConfig->bgs[bgId].tileSize); if (buffer == NULL) { return; @@ -1462,7 +1462,7 @@ void AddWindowParameterized(BgConfig *bgConfig, Window *window, u8 bgId, u8 x, u void AddTextWindowTopLeftCorner(BgConfig *bgConfig, Window *window, u8 width, u8 height, u16 baseTile, u8 paletteNum) { u32 size = width * height * 32; - void *ptr = AllocFromHeap(bgConfig->heapId, size); + void *ptr = Heap_Alloc(bgConfig->heapID, size); paletteNum |= (paletteNum * 16); memset(ptr, paletteNum, size); // could cause a data protection abort if below is true @@ -1482,7 +1482,7 @@ void AddWindow(BgConfig *bgConfig, Window *window, const WindowTemplate *templat } void RemoveWindow(Window *window) { - FreeToHeap(window->pixelBuffer); + Heap_Free(window->pixelBuffer); window->bgConfig = NULL; window->bgId = GF_BG_LYR_UNALLOC; @@ -1498,11 +1498,11 @@ void RemoveWindow(Window *window) { void WindowArray_Delete(Window *windows, s32 count) { for (u16 i = 0; i < count; i++) { if (windows[i].pixelBuffer != NULL) { - FreeToHeap(windows[i].pixelBuffer); + Heap_Free(windows[i].pixelBuffer); } } - FreeToHeap(windows); + Heap_Free(windows); } void CopyWindowToVram(Window *window) { @@ -1877,7 +1877,7 @@ void CopyGlyphToWindow(Window *window, u8 *glyphPixels, u16 srcWidth, u16 srcHei } } else { // 8bpp u8 *convertedSrc; - convertedSrc = Convert4bppTo8bpp(glyphPixels, srcWidth * 4 * srcHeight * 8, window->paletteNum, window->bgConfig->heapId); + convertedSrc = Convert4bppTo8bpp(glyphPixels, srcWidth * 4 * srcHeight * 8, window->paletteNum, window->bgConfig->heapID); switch (glyphSizeParam) { case 0: // 1x1 GLYPH_COPY_8BPP(convertedSrc, 0, 0, srcRight, srcBottom, windowPixels, destX, destY, ConvertPixelsToTiles(destWidth), table); @@ -1900,7 +1900,7 @@ void CopyGlyphToWindow(Window *window, u8 *glyphPixels, u16 srcWidth, u16 srcHei GLYPH_COPY_8BPP(convertedSrc, 8, 8, srcRight - 8, srcBottom - 8, windowPixels, destX, destY, ConvertPixelsToTiles(destWidth), table); break; } - FreeToHeap(convertedSrc); + Heap_Free(convertedSrc); } } @@ -2057,8 +2057,8 @@ void SetWindowPaletteNum(Window *window, u8 paletteNum) { window->paletteNum = paletteNum; } -NNSG2dCharacterData *LoadCharacterDataFromFile(void **char_ret, HeapID heapId, const char *path) { - void *ptr = AllocAndReadFile(heapId, path); +NNSG2dCharacterData *LoadCharacterDataFromFile(void **char_ret, enum HeapID heapID, const char *path) { + void *ptr = AllocAndReadFile(heapID, path); *char_ret = ptr; NNSG2dCharacterData *st0; NNS_G2dGetUnpackedBGCharacterData(ptr, &st0); @@ -2066,8 +2066,8 @@ NNSG2dCharacterData *LoadCharacterDataFromFile(void **char_ret, HeapID heapId, c return st0; } -NNSG2dPaletteData *LoadPaletteDataFromFile(void **pltt_ret, HeapID heapId, const char *path) { - void *ptr = AllocAndReadFile(heapId, path); +NNSG2dPaletteData *LoadPaletteDataFromFile(void **pltt_ret, enum HeapID heapID, const char *path) { + void *ptr = AllocAndReadFile(heapID, path); *pltt_ret = ptr; NNSG2dPaletteData *st0; NNS_G2dGetUnpackedPaletteData(ptr, &st0); @@ -2233,7 +2233,7 @@ BOOL DoesPixelAtScreenXYMatchPtrVal(BgConfig *bgConfig, u8 bgId, u8 x, u8 y, u16 yPixOffs = y & 7; if (bgConfig->bgs[bgId].colorMode == GX_BG_COLORMODE_16) { u16 *tilemapBuffer = bgConfig->bgs[bgId].tilemapBuffer; - u8 *tile = AllocFromHeapAtEnd(bgConfig->heapId, 0x40); + u8 *tile = Heap_AllocAtEnd(bgConfig->heapID, 0x40); bgCharPtr += (tilemapBuffer[tilemapIdx] & 0x3FF) * TILE_SIZE_4BPP; for (i = 0; i < TILE_SIZE_4BPP; i++) { @@ -2242,19 +2242,19 @@ BOOL DoesPixelAtScreenXYMatchPtrVal(BgConfig *bgConfig, u8 bgId, u8 x, u8 y, u16 } ApplyFlipFlagsToTile(bgConfig, (tilemapBuffer[tilemapIdx] >> 10) & 3, tile); pixelValue = tile[xPixOffs + yPixOffs * 8]; - FreeToHeap(tile); + Heap_Free(tile); if ((src[0] & (1 << pixelValue)) != 0) { return TRUE; } } else { if (bgConfig->bgs[bgId].mode != GF_BG_TYPE_AFFINE) { u16 *tilemapBuffer = bgConfig->bgs[bgId].tilemapBuffer; - u8 *tile = AllocFromHeapAtEnd(bgConfig->heapId, 0x40); + u8 *tile = Heap_AllocAtEnd(bgConfig->heapID, 0x40); memcpy(tile, bgCharPtr + (tilemapBuffer[tilemapIdx] & 0x3FF) * TILE_SIZE_8BPP, TILE_SIZE_8BPP); ApplyFlipFlagsToTile(bgConfig, (tilemapBuffer[tilemapIdx] >> 10) & 3, tile); pixelValue = tile[xPixOffs + yPixOffs * 8]; - FreeToHeap(tile); + Heap_Free(tile); } else { pixelValue = bgCharPtr[((u8 *)bgConfig->bgs[bgId].tilemapBuffer)[tilemapIdx] * TILE_SIZE_8BPP + xPixOffs + yPixOffs * 8]; } @@ -2274,7 +2274,7 @@ BOOL DoesPixelAtScreenXYMatchPtrVal(BgConfig *bgConfig, u8 bgId, u8 x, u8 y, u16 static void ApplyFlipFlagsToTile(BgConfig *bgConfig, u8 flags, u8 *tile) { u8 i, j; if (flags != 0) { - u8 *buffer = AllocFromHeapAtEnd(bgConfig->heapId, 0x40); + u8 *buffer = Heap_AllocAtEnd(bgConfig->heapID, 0x40); if ((flags & 1) != 0) { // hflip for (i = 0; i < 8; i++) { for (j = 0; j < 8; j++) { @@ -2289,6 +2289,6 @@ static void ApplyFlipFlagsToTile(BgConfig *bgConfig, u8 flags, u8 *tile) { } memcpy(tile, buffer, 0x40); } - FreeToHeap(buffer); + Heap_Free(buffer); } } diff --git a/arm9/src/blackout.c b/arm9/src/blackout.c index 562310baf..b9eead3e3 100644 --- a/arm9/src/blackout.c +++ b/arm9/src/blackout.c @@ -23,7 +23,7 @@ static void Blackout_DrawMessage(FieldSystem *fieldSystem, TaskManager *taskMana static BOOL Task_ShowPrintedBlackoutMessage(TaskManager *taskManager); static void Blackout_PrintMessage(BlackoutScreenEnvironment *environment, s32 msgNo, u8 x, u8 y); -extern void BeginNormalPaletteFade(u32 pattern, u32 typeTop, u32 typeBottom, u16 colour, u32 duration, u32 framesPer, HeapID heapId); +extern void BeginNormalPaletteFade(u32 pattern, u32 typeTop, u32 typeBottom, u16 colour, u32 duration, u32 framesPer, enum HeapID heapID); extern BOOL IsPaletteFadeFinished(void); extern SaveData *FieldSystem_GetSaveData(FieldSystem *fieldSystem); extern LocalFieldData *Save_LocalFieldData_Get(SaveData *save); @@ -91,7 +91,7 @@ static void Blackout_InitDisplays(BgConfig *bgConfig) { } static void Blackout_DrawMessage(FieldSystem *fieldSystem, TaskManager *taskManager) { - BlackoutScreenEnvironment *env = AllocFromHeap(HEAP_ID_FIELD, sizeof(BlackoutScreenEnvironment)); + BlackoutScreenEnvironment *env = Heap_Alloc(HEAP_ID_FIELD, sizeof(BlackoutScreenEnvironment)); GF_ASSERT(env != NULL); memset(env, 0, sizeof(BlackoutScreenEnvironment)); @@ -155,8 +155,8 @@ static BOOL Task_ShowPrintedBlackoutMessage(TaskManager *taskManager) { MessageFormat_Delete(env->msgFmt); DestroyMsgData(env->msgData); FreeBgTilemapBuffer(env->bgConfig, GF_BG_LYR_MAIN_3); - FreeToHeap(env->bgConfig); - FreeToHeap(env); + Heap_Free(env->bgConfig); + Heap_Free(env); return TRUE; } diff --git a/arm9/src/camera.c b/arm9/src/camera.c index df52e54a9..0aa782260 100644 --- a/arm9/src/camera.c +++ b/arm9/src/camera.c @@ -93,13 +93,13 @@ static void Camera_GetVecFromSomeRingBufferMaybe(Camera *camera, const VecFx32 * } } -void Camera_History_New(s32 count, s32 initialWriteIdx, s32 updateEnableFlags, HeapID heapId, Camera *camera) { +void Camera_History_New(s32 count, s32 initialWriteIdx, s32 updateEnableFlags, enum HeapID heapID, Camera *camera) { if (camera->curTarget == NULL) { return; } GF_ASSERT(initialWriteIdx + 1 <= count); - CameraHistory *history = AllocFromHeap(heapId, sizeof(CameraHistory)); - history->vecs = AllocFromHeap(heapId, sizeof(VecFx32) * count); + CameraHistory *history = Heap_Alloc(heapID, sizeof(CameraHistory)); + history->vecs = Heap_Alloc(heapID, sizeof(VecFx32) * count); for (s32 i = 0; i < count; i++) { history->vecs[i].x = 0; history->vecs[i].y = 0; @@ -127,18 +127,18 @@ void Camera_History_New(s32 count, s32 initialWriteIdx, s32 updateEnableFlags, H void Camera_History_Delete(Camera *camera) { if (camera->history != NULL) { - FreeToHeap(camera->history->vecs); - FreeToHeap(camera->history); + Heap_Free(camera->history->vecs); + Heap_Free(camera->history); camera->history = NULL; } } -Camera *Camera_New(HeapID heapId) { - return AllocFromHeap(heapId, sizeof(Camera)); +Camera *Camera_New(enum HeapID heapID) { + return Heap_Alloc(heapID, sizeof(Camera)); } void Camera_Delete(Camera *camera) { - FreeToHeap(camera); + Heap_Free(camera); } void Camera_Copy(Camera *src, Camera *dest) { diff --git a/arm9/src/communication_error.c b/arm9/src/communication_error.c index 6bd7cdc27..b42daa61c 100644 --- a/arm9/src/communication_error.c +++ b/arm9/src/communication_error.c @@ -71,7 +71,7 @@ static void VBlankIntr(void) { MI_WaitDma(GX_DEFAULT_DMAID); } -void ShowCommunicationError(HeapID heapId, u32 error, u32 errorCode) { +void ShowCommunicationError(enum HeapID heapID, u32 error, u32 errorCode) { Window window; u32 msgNo; @@ -120,21 +120,21 @@ void ShowCommunicationError(HeapID heapId, u32 error, u32 errorCode) { GXS_SetVisibleWnd(0); GfGfx_SetBanks(&sCommunicationErrorGraphicsBanks); - BgConfig *bgConfig = BgConfig_Alloc(heapId); + BgConfig *bgConfig = BgConfig_Alloc(heapID); SetBothScreensModesAndDisable(&sCommunicationErrorGraphicsModes); InitBgFromTemplate(bgConfig, 0, &sCommunicationErrorBgTemplate, GX_BGMODE_0); BgClearTilemapBufferAndCommit(bgConfig, GF_BG_LYR_MAIN_0); - LoadUserFrameGfx1(bgConfig, GF_BG_LYR_MAIN_0, 0x01F7, 2, 0, heapId); - LoadFontPal0(GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_1_OFFSET, heapId); - BG_ClearCharDataRange(GF_BG_LYR_MAIN_0, 0x20, 0, heapId); + LoadUserFrameGfx1(bgConfig, GF_BG_LYR_MAIN_0, 0x01F7, 2, 0, heapID); + LoadFontPal0(GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_1_OFFSET, heapID); + BG_ClearCharDataRange(GF_BG_LYR_MAIN_0, 0x20, 0, heapID); BG_SetMaskColor(GF_BG_LYR_MAIN_0, RGB(1, 1, 27)); BG_SetMaskColor(GF_BG_LYR_SUB_0, RGB(1, 1, 27)); - MsgData *errorMessageData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0200_bin, heapId); - String *errorMessageStr = String_New(384, heapId); - String *tmpStr = String_New(384, heapId); + MsgData *errorMessageData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0200_bin, heapID); + String *errorMessageStr = String_New(384, heapID); + String *tmpStr = String_New(384, heapID); ResetAllTextPrinters(); - MessageFormat *messageFormat = MessageFormat_New(heapId); + MessageFormat *messageFormat = MessageFormat_New(heapID); AddWindow(bgConfig, &window, &sCommunicationErrorWindowTemplate); FillWindowPixelRect(&window, 0xF, 0, 0, 208, 144); @@ -155,5 +155,5 @@ void ShowCommunicationError(HeapID heapId, u32 error, u32 errorCode) { RemoveWindow(&window); DestroyMsgData(errorMessageData); MessageFormat_Delete(messageFormat); - FreeToHeap(bgConfig); + Heap_Free(bgConfig); } diff --git a/arm9/src/easy_chat.c b/arm9/src/easy_chat.c index 192c251f8..0e1f3518a 100644 --- a/arm9/src/easy_chat.c +++ b/arm9/src/easy_chat.c @@ -84,12 +84,12 @@ static const ECIdenticalPhrases sIdenticalPhrases[12] = { { sEasyChatYou, NELEMS(sEasyChatYou) }, }; -EasyChatManager *EasyChatManager_New(HeapID heapId) { - EasyChatManager *ret = AllocFromHeap(heapId, sizeof(EasyChatManager)); +EasyChatManager *EasyChatManager_New(enum HeapID heapID) { + EasyChatManager *ret = Heap_Alloc(heapID, sizeof(EasyChatManager)); for (s32 i = 0; i < EC_GROUP_MAX; i++) { - ret->heapId = heapId; // inadvertently inside the loop - ret->msgData[i] = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, sNarcMsgBanks[i], heapId); + ret->heapID = heapID; // inadvertently inside the loop + ret->msgData[i] = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, sNarcMsgBanks[i], heapID); } return ret; } @@ -98,7 +98,7 @@ void EasyChatManager_Delete(EasyChatManager *easyChatManager) { for (s32 i = 0; i < EC_GROUP_MAX; i++) { DestroyMsgData(easyChatManager->msgData[i]); } - FreeToHeap(easyChatManager); + Heap_Free(easyChatManager); } void EasyChatManager_ReadWordIntoString(EasyChatManager *easyChatManager, u16 ecWord, String *dest) { diff --git a/arm9/src/encounter.c b/arm9/src/encounter.c index 4b6998427..334251cd6 100644 --- a/arm9/src/encounter.c +++ b/arm9/src/encounter.c @@ -43,22 +43,22 @@ extern u16 *LocalFieldData_GetSafariBallsCounter(LocalFieldData *localFieldData) extern Location *LocalFieldData_GetDynamicWarp(LocalFieldData *localFieldData); extern void sub_02049160(TaskManager *taskManager, Location *location); extern void QueueScript(TaskManager *taskManager, u16 script, LocalMapObject *lastInteracted, void *param3); -extern BattleSetup *BattleSetup_New(HeapID heapId, u32 flags); +extern BattleSetup *BattleSetup_New(enum HeapID heapID, u32 flags); extern void BattleSetup_InitFromFieldSystem(BattleSetup *setup, FieldSystem *fieldSystem); extern void ov06_0223CCDC(FieldSystem *fieldSystem, BattleSetup *setup); extern void ov06_0223CD7C(FieldSystem *fieldSystem, u16 species, u8 level, BattleSetup *setup); extern void PalPark_HandleBattleEnd(FieldSystem *fieldSystem, BattleSetup *setup); extern u32 PalPark_CountMonsNotCaught(FieldSystem *fieldSystem); extern void StartScriptFromMenu(TaskManager *taskManager, u16 script, LocalMapObject *lastInteracted); -extern BattleSetup *sub_02047814(HeapID heapId, FieldSystem *fieldSystem); +extern BattleSetup *sub_02047814(enum HeapID heapID, FieldSystem *fieldSystem); extern void sub_02047F1C(BattleSetup *setup, FieldSystem *fieldSystem, void *param2); extern void sub_02047BC0(BattleSetup *setup, FieldSystem *fieldSystem, s32 maxLevel); extern void sub_0204FF5C(FieldSystem *fieldSystem); extern void sub_02047D48(BattleSetup *setup, FieldSystem *fieldSystem, Party *party, void *param3); -extern void *sub_0202920C(IGT *igt, u16 species, u8 gender, u8 param3, HeapID heapId); -extern void *sub_0202918C(IGT *igt, u16 species, u8 gender, u8 param3, HeapID heapId); +extern void *sub_0202920C(IGT *igt, u16 species, u8 gender, u8 param3, enum HeapID heapID); +extern void *sub_0202918C(IGT *igt, u16 species, u8 gender, u8 param3, enum HeapID heapID); extern void sub_02028AD4(u32 *param0, void *param1, u32 param2); -extern void sub_020299DC(u32 *param0, u16 mapId, u16 trainerId, HeapID heapId); +extern void sub_020299DC(u32 *param0, u16 mapId, u16 trainerId, enum HeapID heapID); static BOOL Task_StartBattle(TaskManager *taskManager); static void CallTask_StartBattle(TaskManager *taskManager, BattleSetup *setup); @@ -108,7 +108,7 @@ static void CallTask_StartBattle(TaskManager *taskManager, BattleSetup *setup) { } static Encounter *Encounter_New(BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag) { - Encounter *encounter = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(Encounter)); + Encounter *encounter = Heap_AllocAtEnd(HEAP_ID_FIELD, sizeof(Encounter)); encounter->winFlag = winFlag; if (winFlag != NULL) { *winFlag = BATTLE_OUTCOME_NONE; @@ -121,7 +121,7 @@ static Encounter *Encounter_New(BattleSetup *setup, s32 effect, s32 bgm, u32 *wi static void Encounter_Delete(Encounter *encounter) { BattleSetup_Delete(encounter->setup); - FreeToHeap(encounter); + Heap_Free(encounter); } static BOOL Encounter_GetResult(Encounter *encounter) { @@ -314,7 +314,7 @@ void sub_02046948(TaskManager *taskManager, u32 param1, u32 *winFlag) { } static WildEncounter *WildEncounter_New(BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag) { - WildEncounter *encounter = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(WildEncounter)); + WildEncounter *encounter = Heap_AllocAtEnd(HEAP_ID_FIELD, sizeof(WildEncounter)); encounter->winFlag = winFlag; if (winFlag != NULL) { *winFlag = BATTLE_OUTCOME_NONE; @@ -328,7 +328,7 @@ static WildEncounter *WildEncounter_New(BattleSetup *setup, s32 effect, s32 bgm, static void WildEncounter_Delete(WildEncounter *encounter) { BattleSetup_Delete(encounter->setup); - FreeToHeap(encounter); + Heap_Free(encounter); } void sub_020469B8(FieldSystem *fieldSystem, BattleSetup *setup) { @@ -644,7 +644,7 @@ void SetupAndStartTutorialBattle(TaskManager *taskManager) { TaskManager_Call(taskManager, Task_TutorialBattle, encounter); } -void SetupAndStartTrainerBattle(TaskManager *taskManager, u32 opponentTrainer1, u32 opponentTrainer2, u32 followerTrainerNum, HeapID heapId, u32 *winFlag) { +void SetupAndStartTrainerBattle(TaskManager *taskManager, u32 opponentTrainer1, u32 opponentTrainer2, u32 followerTrainerNum, enum HeapID heapID, u32 *winFlag) { u32 battleType; BattleSetup *setup; FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); @@ -669,7 +669,7 @@ void SetupAndStartTrainerBattle(TaskManager *taskManager, u32 opponentTrainer1, setup->trainerId[BATTLER_ENEMY2] = opponentTrainer2; setup->trainerId[BATTLER_PLAYER2] = followerTrainerNum; - EnemyTrainerSet_Init(setup, fieldSystem->saveData, heapId); + EnemyTrainerSet_Init(setup, fieldSystem->saveData, heapID); GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK8); diff --git a/arm9/src/error_message_reset.c b/arm9/src/error_message_reset.c index 91b7b1745..75c70d323 100644 --- a/arm9/src/error_message_reset.c +++ b/arm9/src/error_message_reset.c @@ -28,7 +28,7 @@ static const struct WindowTemplate sErrorMessageWindowTemplate = { .baseTile = 0x23 }; -static const struct HeapParam sErrorMessageHeapParams = { +static const HeapParam sErrorMessageHeapParams = { .size = 0x00020000, .arena = OS_ARENA_MAIN }; @@ -88,7 +88,7 @@ void PrintErrorMessageAndReset() { OS_SetArenaHi(OS_ARENA_MAIN, OS_GetInitArenaHi(OS_ARENA_MAIN)); OS_SetArenaLo(OS_ARENA_MAIN, OS_GetInitArenaLo(OS_ARENA_MAIN)); - InitHeapSystem(&sErrorMessageHeapParams, 1, 1, 0); + Heap_InitSystem(&sErrorMessageHeapParams, 1, 1, 0); sub_0200E3A0(PM_LCD_TOP, 0); sub_0200E3A0(PM_LCD_BOTTOM, 0); @@ -171,7 +171,7 @@ void PrintErrorMessageAndReset() { RemoveWindow(&buf); DestroyMsgData(msg_data); - FreeToHeap(ptr); + Heap_Free(ptr); OS_ResetSystem(0); } diff --git a/arm9/src/field_move.c b/arm9/src/field_move.c index cf18c0b62..71601863f 100644 --- a/arm9/src/field_move.c +++ b/arm9/src/field_move.c @@ -74,9 +74,9 @@ extern BOOL Task_UseFlyInField(TaskManager *taksManager); extern void TownMap_Init(FieldSystem *fieldSystem, TownMapAppData *townMap, u32 param2); extern void TownMap_Show(FieldSystem *fieldSystem, TownMapAppData *townMap); extern void StartMenu_SetExitTaskFunc(StartMenuTaskData *startMenu, TaskFunc taskFunc); -extern FieldMoveTaskEnvironment *FieldMoveTask_CreateTeleportEnvironment(FieldSystem *fieldSystem, Pokemon *mon, HeapID heapId); +extern FieldMoveTaskEnvironment *FieldMoveTask_CreateTeleportEnvironment(FieldSystem *fieldSystem, Pokemon *mon, enum HeapID heapID); extern BOOL Task_FieldTeleport(TaskManager *taskManager); -extern FieldMoveTaskEnvironment *FieldMoveTask_CreateDigEnvironment(FieldSystem *fieldSystem, Pokemon *mon, HeapID heapId); +extern FieldMoveTaskEnvironment *FieldMoveTask_CreateDigEnvironment(FieldSystem *fieldSystem, Pokemon *mon, enum HeapID heapID); extern BOOL Task_FieldDig(TaskManager *taskManager); extern void *sub_0202914C(u32 param0, u16 mapId, u32 param2); extern void sub_02028AD4(u32 *param0, void *param1, u32 param2); @@ -181,7 +181,7 @@ void FieldMove_InitCheckData(FieldSystem *fieldSystem, FieldMoveCheckData *check } static FieldUseMoveEnvironment *FieldMove_CreateUseEnvironment(FieldMoveUseData *useData, const FieldMoveCheckData *checkData) { - FieldUseMoveEnvironment *environment = AllocFromHeap(HEAP_ID_32, sizeof(FieldUseMoveEnvironment)); + FieldUseMoveEnvironment *environment = Heap_Alloc(HEAP_ID_32, sizeof(FieldUseMoveEnvironment)); environment->magic = 0x19740205; environment->facingObject = checkData->facingObject; environment->useData = *useData; @@ -190,7 +190,7 @@ static FieldUseMoveEnvironment *FieldMove_CreateUseEnvironment(FieldMoveUseData static void FieldMove_DeleteUseEnvironment(FieldUseMoveEnvironment *environment) { GF_ASSERT(environment->magic == 0x19740205); - FreeToHeap(environment); + Heap_Free(environment); } static u32 FieldMove_CheckCut(const FieldMoveCheckData *checkData) { @@ -248,10 +248,10 @@ static u32 FieldMove_CheckFly(const FieldMoveCheckData *checkData) { static void FieldMove_UseFly(FieldMoveUseData *useData, const FieldMoveCheckData *checkData) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(useData->taskManager); StartMenuTaskData *startMenu = TaskManager_GetEnvironment(useData->taskManager); - FieldMoveData *fieldMoveData = AllocFromHeap(HEAP_ID_FIELD, sizeof(FieldMoveData)); + FieldMoveData *fieldMoveData = Heap_Alloc(HEAP_ID_FIELD, sizeof(FieldMoveData)); fieldMoveData->partySlot = useData->partySlot; startMenu->exitTaskEnvironment2 = fieldMoveData; - TownMapAppData *townMap = AllocFromHeap(HEAP_ID_FIELD, sizeof(TownMapAppData)); + TownMapAppData *townMap = Heap_Alloc(HEAP_ID_FIELD, sizeof(TownMapAppData)); startMenu->exitTaskEnvironment = townMap; TownMap_Init(fieldSystem, startMenu->exitTaskEnvironment, 1); TownMap_Show(fieldSystem, startMenu->exitTaskEnvironment); @@ -519,7 +519,7 @@ static BOOL Task_UseTeleportInField(TaskManager *taskManager) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); FieldMoveEnvironment *fieldMoveEnvironment = TaskManager_GetEnvironment(taskManager); FieldMoveTaskEnvironment *fieldMoveTaskEnvironment = FieldMoveTask_CreateTeleportEnvironment(fieldSystem, fieldMoveEnvironment->mon, HEAP_ID_4); - FreeToHeap(fieldMoveEnvironment); + Heap_Free(fieldMoveEnvironment); TaskManager_Jump(taskManager, Task_FieldTeleport, fieldMoveTaskEnvironment); return FALSE; } @@ -553,7 +553,7 @@ static BOOL Task_UseDigInField(TaskManager *taskManager) { FieldMoveEnvironment *fieldMoveEnvironment = TaskManager_GetEnvironment(taskManager); FieldMoveTaskEnvironment *fieldMoveTaskEnvironment = FieldMoveTask_CreateDigEnvironment(fieldSystem, fieldMoveEnvironment->mon, HEAP_ID_FIELD); sub_02028AD4(fieldSystem->unk98, sub_0202914C(10, fieldSystem->location->mapId, 4), 1); - FreeToHeap(fieldMoveEnvironment); + Heap_Free(fieldMoveEnvironment); TaskManager_Jump(taskManager, Task_FieldDig, fieldMoveTaskEnvironment); return FALSE; } diff --git a/arm9/src/field_move_environment.c b/arm9/src/field_move_environment.c index d8eb68d59..96cf2f429 100644 --- a/arm9/src/field_move_environment.c +++ b/arm9/src/field_move_environment.c @@ -6,8 +6,8 @@ #include "party.h" #include "save.h" -FieldMoveEnvironment *FieldMove_CreateEnvironment(HeapID heapId, u8 slotNo, SaveData *saveData) { - FieldMoveEnvironment *environment = AllocFromHeapAtEnd(heapId, sizeof(FieldMoveEnvironment)); +FieldMoveEnvironment *FieldMove_CreateEnvironment(enum HeapID heapID, u8 slotNo, SaveData *saveData) { + FieldMoveEnvironment *environment = Heap_AllocAtEnd(heapID, sizeof(FieldMoveEnvironment)); environment->mon = Party_GetMonByIndex(SaveArray_Party_Get(saveData), slotNo); environment->moveData = NULL; return environment; diff --git a/arm9/src/filesystem.c b/arm9/src/filesystem.c index acaa45ada..c09b34e6e 100644 --- a/arm9/src/filesystem.c +++ b/arm9/src/filesystem.c @@ -196,7 +196,7 @@ void ReadFromNarcMemberByPathAndId(void *dest, const char *path, s32 file_idx, u FS_CloseFile(&file); } -void *AllocAndReadFromNarcMemberByPathAndId(const char *path, s32 file_idx, HeapID heapId, u32 offset, u32 size, BOOL r4) { +void *AllocAndReadFromNarcMemberByPathAndId(const char *path, s32 file_idx, enum HeapID heapID, u32 offset, u32 size, BOOL r4) { FSFile file; register u32 chunk_starts[3]; u32 btnf_size = 0; @@ -233,10 +233,10 @@ void *AllocAndReadFromNarcMemberByPathAndId(const char *path, s32 file_idx, Heap GF_ASSERT(chunk_size != 0); switch (r4) { case 0: - dest = AllocFromHeap(heapId, chunk_size); + dest = Heap_Alloc(heapID, chunk_size); break; default: - dest = AllocFromHeapAtEnd(heapId, chunk_size); + dest = Heap_AllocAtEnd(heapID, chunk_size); break; } FS_ReadFile(&file, dest, (s32)chunk_size); @@ -248,24 +248,24 @@ void ReadWholeNarcMemberByIdPair(void *dest, NarcId narc_id, s32 file_id) { ReadFromNarcMemberByPathAndId(dest, sNarcFileList[narc_id], file_id, 0, 0); } -void *AllocAndReadWholeNarcMemberByIdPair(NarcId narc_id, s32 file_id, HeapID heapId) { - return AllocAndReadFromNarcMemberByPathAndId(sNarcFileList[narc_id], file_id, heapId, 0, 0, FALSE); +void *AllocAndReadWholeNarcMemberByIdPair(NarcId narc_id, s32 file_id, enum HeapID heapID) { + return AllocAndReadFromNarcMemberByPathAndId(sNarcFileList[narc_id], file_id, heapID, 0, 0, FALSE); } -void *AllocAtEndAndReadWholeNarcMemberByIdPair(NarcId narc_id, s32 file_id, HeapID heapId) { - return AllocAndReadFromNarcMemberByPathAndId(sNarcFileList[narc_id], file_id, heapId, 0, 0, TRUE); +void *AllocAtEndAndReadWholeNarcMemberByIdPair(NarcId narc_id, s32 file_id, enum HeapID heapID) { + return AllocAndReadFromNarcMemberByPathAndId(sNarcFileList[narc_id], file_id, heapID, 0, 0, TRUE); } void ReadFromNarcMemberByIdPair(void *dest, NarcId narc_id, s32 file_id, u32 offset, u32 size) { ReadFromNarcMemberByPathAndId(dest, sNarcFileList[narc_id], file_id, offset, size); } -void *AllocAndReadFromNarcMemberByIdPair(NarcId narc_id, s32 file_id, HeapID heapId, u32 offset, u32 size) { - return AllocAndReadFromNarcMemberByPathAndId(sNarcFileList[narc_id], file_id, heapId, offset, size, FALSE); +void *AllocAndReadFromNarcMemberByIdPair(NarcId narc_id, s32 file_id, enum HeapID heapID, u32 offset, u32 size) { + return AllocAndReadFromNarcMemberByPathAndId(sNarcFileList[narc_id], file_id, heapID, offset, size, FALSE); } -void *AllocAtEndAndReadFromNarcMemberByIdPair(NarcId narc_id, s32 file_id, HeapID heapId, u32 offset, u32 size) { - return AllocAndReadFromNarcMemberByPathAndId(sNarcFileList[narc_id], file_id, heapId, offset, size, TRUE); +void *AllocAtEndAndReadFromNarcMemberByIdPair(NarcId narc_id, s32 file_id, enum HeapID heapID, u32 offset, u32 size) { + return AllocAndReadFromNarcMemberByPathAndId(sNarcFileList[narc_id], file_id, heapID, offset, size, TRUE); } u32 GetNarcMemberSizeByIdPair(NarcId narc_id, s32 file_idx) { @@ -302,8 +302,8 @@ u32 GetNarcMemberSizeByIdPair(NarcId narc_id, s32 file_idx) { return chunk_size; } -NARC *NARC_New(NarcId narc_id, HeapID heapId) { - NARC *narc = (NARC *)AllocFromHeap(heapId, sizeof(NARC)); +NARC *NARC_New(NarcId narc_id, enum HeapID heapID) { + NARC *narc = (NARC *)Heap_Alloc(heapID, sizeof(NARC)); u32 btnf_start; u32 chunk_size; if (narc != NULL) { @@ -325,10 +325,10 @@ NARC *NARC_New(NarcId narc_id, HeapID heapId) { void NARC_Delete(NARC *narc) { FS_CloseFile(&narc->file); - FreeToHeap(narc); // free to heap + Heap_Free(narc); // free to heap } -void *NARC_AllocAndReadWholeMember(NARC *narc, u32 file_id, HeapID heapId) { +void *NARC_AllocAndReadWholeMember(NARC *narc, u32 file_id, enum HeapID heapID) { u32 file_start; u32 file_end; void *dest; @@ -337,7 +337,7 @@ void *NARC_AllocAndReadWholeMember(NARC *narc, u32 file_id, HeapID heapId) { FS_ReadFile(&narc->file, &file_start, 4); FS_ReadFile(&narc->file, &file_end, 4); FS_SeekFile(&narc->file, (s32)(narc->gmif_start + 8 + file_start), FS_SEEK_SET); - dest = AllocFromHeap(heapId, file_end - file_start); + dest = Heap_Alloc(heapID, file_end - file_start); if (dest != NULL) { FS_ReadFile(&narc->file, dest, (s32)(file_end - file_start)); } diff --git a/arm9/src/font.c b/arm9/src/font.c index e8b3470d9..399c77c4b 100644 --- a/arm9/src/font.c +++ b/arm9/src/font.c @@ -41,15 +41,15 @@ void sub_02002C14() { SetFontsPointer(&gFontInfos[0]); } -void sub_02002C50(u32 font_id, HeapID heapId) { - UNK_02106FC8->unk94[font_id] = FontData_New(NARC_GRAPHIC_FONT, UNK_020ECB54[font_id][0], 1, UNK_020ECB54[font_id][1], heapId); +void sub_02002C50(u32 font_id, enum HeapID heapID) { + UNK_02106FC8->unk94[font_id] = FontData_New(NARC_GRAPHIC_FONT, UNK_020ECB54[font_id][0], 1, UNK_020ECB54[font_id][1], heapID); } -void sub_02002C84(s32 param0, HeapID heapId) { +void sub_02002C84(s32 param0, enum HeapID heapID) { GF_ASSERT(param0 < 4); GF_ASSERT(UNK_02106FC8->unk94[param0] != NULL); - FontData_ModeSwitch(UNK_02106FC8->unk94[param0], 0, heapId); + FontData_ModeSwitch(UNK_02106FC8->unk94[param0], 0, heapID); } void sub_02002CC0(s32 param0) { @@ -73,7 +73,7 @@ void sub_02002CF8(int param0) { } if (i == 4) { - FreeToHeap(UNK_02106FC8->unk84[param0]); + Heap_Free(UNK_02106FC8->unk84[param0]); UNK_02106FC8->unk84[param0] = NULL; } } @@ -145,12 +145,12 @@ s32 GetFontAttribute(u8 fontId, s32 attr) { return ret; } -void LoadFontPal0(enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotOffset, HeapID heapId) { - GfGfxLoader_GXLoadPal(NARC_GRAPHIC_FONT, NARC_font_narc_0006_NCLR, location, palSlotOffset, 0x20, heapId); +void LoadFontPal0(enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotOffset, enum HeapID heapID) { + GfGfxLoader_GXLoadPal(NARC_GRAPHIC_FONT, NARC_font_narc_0006_NCLR, location, palSlotOffset, 0x20, heapID); } -void LoadFontPal1(enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotOffset, HeapID heapId) { - GfGfxLoader_GXLoadPal(NARC_GRAPHIC_FONT, NARC_font_narc_0007_NCLR, location, palSlotOffset, 0x20, heapId); +void LoadFontPal1(enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotOffset, enum HeapID heapID) { + GfGfxLoader_GXLoadPal(NARC_GRAPHIC_FONT, NARC_font_narc_0007_NCLR, location, palSlotOffset, 0x20, heapID); } u32 FontID_String_GetWidthMultiline(u32 param0, struct String *str, u32 param2) { diff --git a/arm9/src/game_init.c b/arm9/src/game_init.c index 40eb6a002..4501f84c2 100644 --- a/arm9/src/game_init.c +++ b/arm9/src/game_init.c @@ -91,7 +91,7 @@ void Main_ToggleHBlankInterrupt(BOOL enableFlag) { (void)OS_EnableIrq(); } -const struct HeapParam UNK_020EDB10[] = { +const HeapParam UNK_020EDB10[] = { { 0x00D000, OS_ARENA_MAIN }, { 0x021000, OS_ARENA_MAIN }, { 0x001000, OS_ARENA_MAIN }, @@ -111,7 +111,7 @@ void sub_02015FC8(void) { while (csum & 3) { csum++; } - InitHeapSystem(UNK_020EDB10, NELEMS(UNK_020EDB10), 92, csum); + Heap_InitSystem(UNK_020EDB10, NELEMS(UNK_020EDB10), 92, csum); } void InitSystemForTheGame(void) { @@ -157,17 +157,17 @@ void InitGraphicMemory(void) { MI_CpuClearFast((void *)HW_DB_PLTT, HW_DB_PLTT_SIZE); } -void *AllocAndReadFile(HeapID heapId, const char *path) { +void *AllocAndReadFile(enum HeapID heapID, const char *path) { void *ret; FSFile file; FS_InitFile(&file); if (FS_OpenFile(&file, path)) { u32 size = file.prop.file.bottom - file.prop.file.top; - ret = AllocFromHeap(heapId, size); + ret = Heap_Alloc(heapID, size); if (ret != NULL) { if (size != FS_ReadFile(&file, ret, (s32)size)) { - FreeToHeapExplicit(heapId, ret); + Heap_FreeExplicit(heapID, ret); ret = NULL; } } @@ -237,14 +237,14 @@ int AddFileToCache(void *contents, u32 hash) { void ClearFileCache(void) { for (int i = 127; i > -1; i--) { if (sFileCache[i].contents != NULL) { - FreeToHeap(sFileCache[i].contents); + Heap_Free(sFileCache[i].contents); sFileCache[i].contents = NULL; sFileCache[i].name_hash = 0; } } } -void *OpenFileCached(const s8 *str, HeapID heapId) { +void *OpenFileCached(const s8 *str, enum HeapID heapID) { s8 filenameBuf[32]; FSFile file; void *ret; @@ -264,10 +264,10 @@ void *OpenFileCached(const s8 *str, HeapID heapId) { FS_InitFile(&file); if (FS_OpenFile(&file, (const char *)filenameBuf)) { u32 size = file.prop.file.bottom - file.prop.file.top; - ret = AllocFromHeap(heapId, size); + ret = Heap_Alloc(heapID, size); if (ret != NULL) { if (size != FS_ReadFile(&file, ret, (s32)size)) { - FreeToHeap(ret); + Heap_Free(ret); ret = NULL; } } diff --git a/arm9/src/gf_gfx_loader.c b/arm9/src/gf_gfx_loader.c index d60cff9b9..42d610cca 100644 --- a/arm9/src/gf_gfx_loader.c +++ b/arm9/src/gf_gfx_loader.c @@ -5,9 +5,9 @@ #include "NNS_g2d.h" #include "filesystem.h" -u32 GfGfxLoader_LoadCharData(NarcId narcId, s32 memberNo, struct BgConfig *unkStruct02016B94_2, u32 layer, u32 numTiles, u32 szByte, BOOL isCompressed, HeapID heapId) { +u32 GfGfxLoader_LoadCharData(NarcId narcId, s32 memberNo, struct BgConfig *unkStruct02016B94_2, u32 layer, u32 numTiles, u32 szByte, BOOL isCompressed, enum HeapID heapID) { NNSG2dCharacterData *pCharData; - void *pFile = GfGfxLoader_LoadFromNarc(narcId, memberNo, isCompressed, heapId, FALSE); + void *pFile = GfGfxLoader_LoadFromNarc(narcId, memberNo, isCompressed, heapID, FALSE); if (pFile != NULL) { if (NNS_G2dGetUnpackedBGCharacterData(pFile, &pCharData)) { if (szByte == 0) { @@ -15,14 +15,14 @@ u32 GfGfxLoader_LoadCharData(NarcId narcId, s32 memberNo, struct BgConfig *unkSt } BG_LoadCharTilesData(unkStruct02016B94_2, (u8)layer, pCharData->pRawData, szByte, numTiles); } - FreeToHeap(pFile); + Heap_Free(pFile); } return szByte; } -void GfGfxLoader_LoadScrnData(NarcId narcId, s32 memberNo, struct BgConfig *unkStruct02016B94_2, u32 layer, u32 tileOffset, u32 szByte, BOOL isCompressed, HeapID heapId) { +void GfGfxLoader_LoadScrnData(NarcId narcId, s32 memberNo, struct BgConfig *unkStruct02016B94_2, u32 layer, u32 tileOffset, u32 szByte, BOOL isCompressed, enum HeapID heapID) { NNSG2dScreenData *pScreenData; - void *pFile = GfGfxLoader_LoadFromNarc(narcId, memberNo, isCompressed, heapId, TRUE); + void *pFile = GfGfxLoader_LoadFromNarc(narcId, memberNo, isCompressed, heapID, TRUE); if (pFile != NULL) { if (NNS_G2dGetUnpackedScreenData(pFile, &pScreenData)) { if (szByte == 0) { @@ -33,15 +33,15 @@ void GfGfxLoader_LoadScrnData(NarcId narcId, s32 memberNo, struct BgConfig *unkS } BgCopyOrUncompressTilemapBufferRangeToVram(unkStruct02016B94_2, (u8)layer, pScreenData->rawData, szByte, tileOffset); } - FreeToHeap(pFile); + Heap_Free(pFile); } } -void GfGfxLoader_GXLoadPal(NarcId narcId, s32 memberNo, enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotOffset, u32 szByte, HeapID heapId) { - GfGfxLoader_GXLoadPalWithSrcOffset(narcId, memberNo, location, 0, palSlotOffset, szByte, heapId); +void GfGfxLoader_GXLoadPal(NarcId narcId, s32 memberNo, enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotOffset, u32 szByte, enum HeapID heapID) { + GfGfxLoader_GXLoadPalWithSrcOffset(narcId, memberNo, location, 0, palSlotOffset, szByte, heapID); } -void GfGfxLoader_GXLoadPalWithSrcOffset(NarcId narcId, s32 memberNo, enum GFPalLoadLocation location, u32 srcOffset, enum GFPalSlotOffset palSlotOffset, u32 szByte, HeapID heapId) { +void GfGfxLoader_GXLoadPalWithSrcOffset(NarcId narcId, s32 memberNo, enum GFPalLoadLocation location, u32 srcOffset, enum GFPalSlotOffset palSlotOffset, u32 szByte, enum HeapID heapID) { static void (*const load_funcs[])(void *, u32, u32) = { GX_LoadBGPltt, GX_LoadOBJPltt, @@ -53,7 +53,7 @@ void GfGfxLoader_GXLoadPalWithSrcOffset(NarcId narcId, s32 memberNo, enum GFPalL GXS_LoadOBJExtPltt }; NNSG2dPaletteData *pPltData; - void *pFile = GfGfxLoader_LoadFromNarc(narcId, memberNo, FALSE, heapId, TRUE); + void *pFile = GfGfxLoader_LoadFromNarc(narcId, memberNo, FALSE, heapID, TRUE); if (pFile != NULL) { if (NNS_G2dGetUnpackedPaletteData(pFile, &pPltData)) { pPltData->pRawData = (void *)((u32)pPltData->pRawData + srcOffset); @@ -87,11 +87,11 @@ void GfGfxLoader_GXLoadPalWithSrcOffset(NarcId narcId, s32 memberNo, enum GFPalL break; } } - FreeToHeap(pFile); + Heap_Free(pFile); } } -u32 GfGfxLoader_LoadWholePalette(NarcId narcId, s32 memberId, u32 layer, u32 baseAddr, u32 szByte, BOOL isCompressed, HeapID heapId) // todo: change this to new format +u32 GfGfxLoader_LoadWholePalette(NarcId narcId, s32 memberId, u32 layer, u32 baseAddr, u32 szByte, BOOL isCompressed, enum HeapID heapID) // todo: change this to new format { static void (*const load_funcs[])(void *, u32, u32) = { GX_LoadOBJ, @@ -99,7 +99,7 @@ u32 GfGfxLoader_LoadWholePalette(NarcId narcId, s32 memberId, u32 layer, u32 bas }; NNSG2dCharacterData *pCharData; - void *pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heapId, TRUE); + void *pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heapID, TRUE); if (pFile != NULL) { if (NNS_G2dGetUnpackedCharacterData(pFile, &pCharData)) { if (szByte == 0) { @@ -108,13 +108,13 @@ u32 GfGfxLoader_LoadWholePalette(NarcId narcId, s32 memberId, u32 layer, u32 bas DC_FlushRange(pCharData->pRawData, szByte); load_funcs[layer](pCharData->pRawData, baseAddr, szByte); } - FreeToHeap(pFile); + Heap_Free(pFile); } return szByte; } -void GfGfxLoader_PartiallyLoadPalette(NarcId narcId, s32 memberId, NNS_G2D_VRAM_TYPE vramType, u32 baseAddr, HeapID heapId, NNSG2dImagePaletteProxy *pPltProxy) { - void *pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, FALSE, heapId, TRUE); +void GfGfxLoader_PartiallyLoadPalette(NarcId narcId, s32 memberId, NNS_G2D_VRAM_TYPE vramType, u32 baseAddr, enum HeapID heapID, NNSG2dImagePaletteProxy *pPltProxy) { + void *pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, FALSE, heapID, TRUE); NNSG2dPaletteData *pPlttData; NNSG2dPaletteCompressInfo *pCompressInfo; if (pFile != NULL) { @@ -126,17 +126,17 @@ void GfGfxLoader_PartiallyLoadPalette(NarcId narcId, s32 memberId, NNS_G2D_VRAM_ NNS_G2dLoadPalette(pPlttData, baseAddr, vramType, pPltProxy); } } - FreeToHeap(pFile); + Heap_Free(pFile); } } -u32 GfGfxLoader_LoadImageMapping(NarcId narcId, s32 memberId, BOOL isCompressed, u32 layer, u32 szByte, NNS_G2D_VRAM_TYPE type, u32 baseAddr, HeapID heapId, NNSG2dImageProxy *pImgProxy) { +u32 GfGfxLoader_LoadImageMapping(NarcId narcId, s32 memberId, BOOL isCompressed, u32 layer, u32 szByte, NNS_G2D_VRAM_TYPE type, u32 baseAddr, enum HeapID heapID, NNSG2dImageProxy *pImgProxy) { static void (*const load_funcs[])(const NNSG2dCharacterData *, u32, NNS_G2D_VRAM_TYPE, NNSG2dImageProxy *) = { NNS_G2dLoadImage1DMapping, NNS_G2dLoadImage2DMapping }; - void *pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heapId, TRUE); + void *pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heapID, TRUE); u32 retSize = 0; NNSG2dCharacterData *pSrcData; if (pFile != NULL) { @@ -147,18 +147,18 @@ u32 GfGfxLoader_LoadImageMapping(NarcId narcId, s32 memberId, BOOL isCompressed, load_funcs[layer](pSrcData, baseAddr, type, pImgProxy); retSize = pSrcData->szByte; } - FreeToHeap(pFile); + Heap_Free(pFile); } return retSize; } -void GfGfxLoader_SetObjCntFlagsAndLoadImageMapping(NarcId narcId, s32 memberId, BOOL isCompressed, u32 layer, u32 szByte, NNS_G2D_VRAM_TYPE type, u32 baseAddr, HeapID heapId, NNSG2dImageProxy *pImageProxy) { +void GfGfxLoader_SetObjCntFlagsAndLoadImageMapping(NarcId narcId, s32 memberId, BOOL isCompressed, u32 layer, u32 szByte, NNS_G2D_VRAM_TYPE type, u32 baseAddr, enum HeapID heapID, NNSG2dImageProxy *pImageProxy) { static void (*const load_funcs[])(const NNSG2dCharacterData *, u32, NNS_G2D_VRAM_TYPE, NNSG2dImageProxy *) = { NNS_G2dLoadImage1DMapping, NNS_G2dLoadImage2DMapping }; NNSG2dCharacterData *pCharacterData; - void *pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heapId, TRUE); + void *pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heapID, TRUE); if (pFile != NULL) { if (NNS_G2dGetUnpackedCharacterData(pFile, &pCharacterData)) { if (szByte != 0) { @@ -175,90 +175,90 @@ void GfGfxLoader_SetObjCntFlagsAndLoadImageMapping(NarcId narcId, s32 memberId, } load_funcs[layer](pCharacterData, baseAddr, type, pImageProxy); } - FreeToHeap(pFile); + Heap_Free(pFile); } } -void *GfGfxLoader_GetCharData(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dCharacterData **ppCharData, HeapID heapId) { - void *pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heapId, FALSE); +void *GfGfxLoader_GetCharData(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dCharacterData **ppCharData, enum HeapID heapID) { + void *pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heapID, FALSE); if (pFile != NULL) { if (!NNS_G2dGetUnpackedBGCharacterData(pFile, ppCharData)) { - FreeToHeap(pFile); + Heap_Free(pFile); return NULL; } } return pFile; } -void *GfGfxLoader_GetScrnData(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dScreenData **ppScrData, HeapID heapId) { - void *pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heapId, FALSE); +void *GfGfxLoader_GetScrnData(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dScreenData **ppScrData, enum HeapID heapID) { + void *pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heapID, FALSE); if (pFile != NULL) { if (!NNS_G2dGetUnpackedScreenData(pFile, ppScrData)) { - FreeToHeap(pFile); + Heap_Free(pFile); return NULL; } } return pFile; } -void *GfGfxLoader_GetPlttData(NarcId narcId, s32 memberId, NNSG2dPaletteData **ppPltData, HeapID heapId) { - void *pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, FALSE, heapId, FALSE); +void *GfGfxLoader_GetPlttData(NarcId narcId, s32 memberId, NNSG2dPaletteData **ppPltData, enum HeapID heapID) { + void *pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, FALSE, heapID, FALSE); if (pFile != NULL) { if (!NNS_G2dGetUnpackedPaletteData(pFile, ppPltData)) { - FreeToHeap(pFile); + Heap_Free(pFile); return NULL; } } return pFile; } -void *GfGfxLoader_GetCellBank(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dCellDataBank **ppCellBank, HeapID heapId) { - void *pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heapId, FALSE); +void *GfGfxLoader_GetCellBank(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dCellDataBank **ppCellBank, enum HeapID heapID) { + void *pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heapID, FALSE); if (pFile != NULL) { if (!NNS_G2dGetUnpackedCellBank(pFile, ppCellBank)) { - FreeToHeap(pFile); + Heap_Free(pFile); return NULL; } } return pFile; } -void *GfGfxLoader_GetAnimBank(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dAnimBankData **ppAnimBank, HeapID heapId) { - void *pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heapId, FALSE); +void *GfGfxLoader_GetAnimBank(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dAnimBankData **ppAnimBank, enum HeapID heapID) { + void *pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heapID, FALSE); if (pFile != NULL) { if (!NNS_G2dGetUnpackedAnimBank(pFile, ppAnimBank)) { - FreeToHeap(pFile); + Heap_Free(pFile); return NULL; } } return pFile; } -void *GfGfxLoader_UncompressFromNarc(NarcId narcId, s32 memberId, HeapID heapId) { - return GfGfxLoader_LoadFromNarc(narcId, memberId, TRUE, heapId, FALSE); +void *GfGfxLoader_UncompressFromNarc(NarcId narcId, s32 memberId, enum HeapID heapID) { + return GfGfxLoader_LoadFromNarc(narcId, memberId, TRUE, heapID, FALSE); } -void *GfGfxLoader_LoadFromNarc(NarcId narcId, s32 memberNo, BOOL isCompressed, HeapID heapId, BOOL allocAtEnd) { +void *GfGfxLoader_LoadFromNarc(NarcId narcId, s32 memberNo, BOOL isCompressed, enum HeapID heapID, BOOL allocAtEnd) { void *dest; void *dest2; if (isCompressed || allocAtEnd == TRUE) { u32 size = GetNarcMemberSizeByIdPair(narcId, memberNo); - dest = AllocFromHeapAtEnd(heapId, size); + dest = Heap_AllocAtEnd(heapID, size); } else { u32 size = GetNarcMemberSizeByIdPair(narcId, memberNo); - dest = AllocFromHeap(heapId, size); + dest = Heap_Alloc(heapID, size); } if (dest != NULL) { ReadWholeNarcMemberByIdPair(dest, narcId, memberNo); if (isCompressed) { if (allocAtEnd == FALSE) { - dest2 = AllocFromHeap(heapId, (*(u32 *)dest) >> 8); + dest2 = Heap_Alloc(heapID, (*(u32 *)dest) >> 8); } else { - dest2 = AllocFromHeapAtEnd(heapId, (*(u32 *)dest) >> 8); + dest2 = Heap_AllocAtEnd(heapID, (*(u32 *)dest) >> 8); } if (dest2 != NULL) { MI_UncompressLZ8(dest, dest2); - FreeToHeap(dest); + Heap_Free(dest); } dest = dest2; // UB: if dest2 is NULL, dest is never freed } @@ -266,27 +266,27 @@ void *GfGfxLoader_LoadFromNarc(NarcId narcId, s32 memberNo, BOOL isCompressed, H return dest; } -void *GfGfxLoader_LoadFromNarc_GetSizeOut(NarcId narcId, s32 memberNo, BOOL isCompressed, HeapID heapId, BOOL allocAtEnd, u32 *size_p) { +void *GfGfxLoader_LoadFromNarc_GetSizeOut(NarcId narcId, s32 memberNo, BOOL isCompressed, enum HeapID heapID, BOOL allocAtEnd, u32 *size_p) { void *dest; void *dest2; *size_p = GetNarcMemberSizeByIdPair(narcId, memberNo); if (isCompressed || allocAtEnd == TRUE) { - dest = AllocFromHeapAtEnd(heapId, *size_p); + dest = Heap_AllocAtEnd(heapID, *size_p); } else { - dest = AllocFromHeap(heapId, *size_p); + dest = Heap_Alloc(heapID, *size_p); } if (dest != NULL) { ReadWholeNarcMemberByIdPair(dest, narcId, memberNo); if (isCompressed) { *size_p = (*(u32 *)dest) >> 8; if (allocAtEnd == FALSE) { - dest2 = AllocFromHeap(heapId, *size_p); + dest2 = Heap_Alloc(heapID, *size_p); } else { - dest2 = AllocFromHeapAtEnd(heapId, *size_p); + dest2 = Heap_AllocAtEnd(heapID, *size_p); } if (dest2 != NULL) { MI_UncompressLZ8(dest, dest2); - FreeToHeap(dest); + Heap_Free(dest); } dest = dest2; // UB: if dest2 is NULL, dest is never freed } diff --git a/arm9/src/heap.c b/arm9/src/heap.c index fa3958f65..749438914 100644 --- a/arm9/src/heap.c +++ b/arm9/src/heap.c @@ -7,7 +7,7 @@ #include "error_message_reset.h" #include "unk_02031734.h" -struct HeapInfo { +typedef struct HeapInfo { NNSFndHeapHandle *heapHandles; NNSFndHeapHandle *parentHeapHandles; void **subHeapRawPtrs; @@ -16,52 +16,53 @@ struct HeapInfo { u16 totalNumHeaps; u16 nTemplates; u16 maxHeaps; - u16 unallocatedHeapId; -}; + u16 unallocatedHeapID; +} HeapInfo; typedef struct MemoryBlock { u8 filler_00[12]; - u32 heapId : 8; + u32 heapID : 8; u32 filler_0D : 24; } MemoryBlock; -struct HeapInfo sHeapInfo; +static HeapInfo sHeapInfo; -void InitHeapSystem(const struct HeapParam *templates, u32 nTemplates, u32 totalNumHeaps, u32 pre_size) { +static BOOL CreateHeapInternal(enum HeapID parent, enum HeapID child, u32 size, s32 alignment); + +void Heap_InitSystem(const HeapParam *templates, u32 nTemplates, u32 totalNumHeaps, u32 preSize) { void *ptr; - u32 unk_size, i; + u32 i; + u32 usableHeaps = nTemplates + 24; - unk_size = nTemplates + 24; - - if (totalNumHeaps < unk_size) { - totalNumHeaps = unk_size; + if (totalNumHeaps < usableHeaps) { + totalNumHeaps = usableHeaps; } - if (pre_size != 0) { + + if (preSize != 0) { // force align - while (pre_size % 4 != 0) { - pre_size++; + while (preSize % 4 != 0) { + preSize++; } - OS_AllocFromArenaLo(OS_ARENA_MAIN, pre_size, 4); + OS_AllocFromArenaLo(OS_ARENA_MAIN, preSize, 4); } sHeapInfo.heapHandles = (NNSFndHeapHandle *)OS_AllocFromArenaLo( OS_ARENA_MAIN, - (unk_size + 1) * sizeof(NNSFndHeapHandle) - + unk_size * sizeof(NNSFndHeapHandle) - + unk_size * sizeof(void *) + (usableHeaps + 1) * sizeof(NNSFndHeapHandle) + + usableHeaps * sizeof(NNSFndHeapHandle) + + usableHeaps * sizeof(void *) + totalNumHeaps * sizeof(u16) + totalNumHeaps, 4); - sHeapInfo.parentHeapHandles = sHeapInfo.heapHandles + (unk_size + 1); - sHeapInfo.subHeapRawPtrs = (void **)(sHeapInfo.parentHeapHandles + unk_size); - sHeapInfo.numMemBlocks = (u16 *)(sHeapInfo.subHeapRawPtrs + unk_size); + sHeapInfo.parentHeapHandles = sHeapInfo.heapHandles + (usableHeaps + 1); + sHeapInfo.subHeapRawPtrs = (void **)(sHeapInfo.parentHeapHandles + usableHeaps); + sHeapInfo.numMemBlocks = (u16 *)(sHeapInfo.subHeapRawPtrs + usableHeaps); sHeapInfo.heapIdxs = (u8 *)(sHeapInfo.numMemBlocks + totalNumHeaps); sHeapInfo.totalNumHeaps = (u16)totalNumHeaps; sHeapInfo.nTemplates = (u16)nTemplates; - - sHeapInfo.unallocatedHeapId = (u16)unk_size; - sHeapInfo.maxHeaps = (u16)unk_size; + sHeapInfo.unallocatedHeapID = (u16)usableHeaps; + sHeapInfo.maxHeaps = (u16)usableHeaps; for (i = 0; i < nTemplates; i++) { switch (templates[i].arena) { @@ -75,23 +76,20 @@ void InitHeapSystem(const struct HeapParam *templates, u32 nTemplates, u32 total } if (ptr != NULL) { - sHeapInfo.heapHandles[i] = NNS_FndCreateExpHeap(ptr, templates[i].size); sHeapInfo.heapIdxs[i] = (u8)i; } else { - GF_ASSERT(0); + GF_ASSERT(FALSE); } } - for (i = nTemplates; i < unk_size + 1; i++) { + for (i = nTemplates; i < usableHeaps + 1; i++) { sHeapInfo.heapHandles[i] = NULL; - sHeapInfo.heapIdxs[i] = (u8)sHeapInfo.unallocatedHeapId; + sHeapInfo.heapIdxs[i] = (u8)sHeapInfo.unallocatedHeapID; } while (i < totalNumHeaps) { - sHeapInfo.heapIdxs[i] = (u8)sHeapInfo.unallocatedHeapId; - - i++; + sHeapInfo.heapIdxs[i++] = (u8)sHeapInfo.unallocatedHeapID; } for (i = 0; i < totalNumHeaps; i++) { @@ -99,7 +97,7 @@ void InitHeapSystem(const struct HeapParam *templates, u32 nTemplates, u32 total } } -s32 FindFirstAvailableHeapHandle(void) { +static s32 FindFirstAvailableHeapHandle(void) { s32 i; for (i = sHeapInfo.nTemplates; i < sHeapInfo.maxHeaps; i++) { @@ -111,19 +109,19 @@ s32 FindFirstAvailableHeapHandle(void) { return -1; } -BOOL CreateHeap(u32 parent, u32 child, u32 size) { +BOOL Heap_Create(enum HeapID parent, enum HeapID child, u32 size) { return CreateHeapInternal(parent, child, size, 4); } -BOOL CreateHeapAtEnd(u32 parent, u32 child, u32 size) { +BOOL Heap_CreateAtEnd(enum HeapID parent, enum HeapID child, u32 size) { return CreateHeapInternal(parent, child, size, -4); } -BOOL CreateHeapInternal(u32 parent, u32 child, u32 size, s32 alignment) { +static BOOL CreateHeapInternal(enum HeapID parent, enum HeapID child, u32 size, s32 alignment) { GF_ASSERT(OS_GetProcMode() != OS_PROCMODE_IRQ); u8 *ptr = sHeapInfo.heapIdxs; - if (sHeapInfo.unallocatedHeapId == ptr[child]) { + if (sHeapInfo.unallocatedHeapID == ptr[child]) { NNSFndHeapHandle parentHeap = sHeapInfo.heapHandles[ptr[parent]]; if (parentHeap != NULL) { void *newHeapAddr = NNS_FndAllocFromExpHeapEx(parentHeap, size, alignment); @@ -139,58 +137,58 @@ BOOL CreateHeapInternal(u32 parent, u32 child, u32 size, s32 alignment) { return TRUE; } else { - GF_ASSERT(0); + GF_ASSERT(FALSE); } } else { - GF_ASSERT(0); + GF_ASSERT(FALSE); } } else { - GF_ASSERT(0); + GF_ASSERT(FALSE); } } else { - GF_ASSERT(0); + GF_ASSERT(FALSE); } } else { - GF_ASSERT(0); + GF_ASSERT(FALSE); } return FALSE; } -void DestroyHeap(HeapID heapId) { +void Heap_Destroy(enum HeapID heapID) { GF_ASSERT(OS_GetProcMode() != OS_PROCMODE_IRQ); - NNSFndHeapHandle handle = sHeapInfo.heapHandles[sHeapInfo.heapIdxs[heapId]]; + NNSFndHeapHandle handle = sHeapInfo.heapHandles[sHeapInfo.heapIdxs[heapID]]; if (handle != NULL) { NNS_FndDestroyExpHeap(handle); - u8 index = sHeapInfo.heapIdxs[heapId]; + u8 index = sHeapInfo.heapIdxs[heapID]; NNSFndHeapHandle parentHeap = sHeapInfo.parentHeapHandles[index]; void *childRaw = sHeapInfo.subHeapRawPtrs[index]; if (parentHeap != NULL && childRaw != NULL) { NNS_FndFreeToExpHeap(parentHeap, childRaw); } else { - GF_ASSERT(0); + GF_ASSERT(FALSE); } - sHeapInfo.heapHandles[sHeapInfo.heapIdxs[heapId]] = NULL; - sHeapInfo.parentHeapHandles[sHeapInfo.heapIdxs[heapId]] = NULL; - sHeapInfo.subHeapRawPtrs[sHeapInfo.heapIdxs[heapId]] = NULL; + sHeapInfo.heapHandles[sHeapInfo.heapIdxs[heapID]] = NULL; + sHeapInfo.parentHeapHandles[sHeapInfo.heapIdxs[heapID]] = NULL; + sHeapInfo.subHeapRawPtrs[sHeapInfo.heapIdxs[heapID]] = NULL; - sHeapInfo.heapIdxs[heapId] = (u8)sHeapInfo.unallocatedHeapId; + sHeapInfo.heapIdxs[heapID] = (u8)sHeapInfo.unallocatedHeapID; } } -void *AllocFromHeapInternal(NNSFndHeapHandle heap, u32 size, s32 alignment, HeapID heapId) { +static void *AllocFromHeapInternal(NNSFndHeapHandle heap, u32 size, s32 alignment, enum HeapID heapID) { GF_ASSERT(heap); - OSIntrMode intr_mode = OS_DisableInterrupts(); + OSIntrMode intrMode = OS_DisableInterrupts(); size += sizeof(MemoryBlock); void *ptr = NNS_FndAllocFromExpHeapEx(heap, size, alignment); - OS_RestoreInterrupts(intr_mode); + OS_RestoreInterrupts(intrMode); if (ptr != NULL) { - ((MemoryBlock *)ptr)->heapId = heapId; + ((MemoryBlock *)ptr)->heapID = heapID; ptr += sizeof(MemoryBlock); } @@ -198,20 +196,22 @@ void *AllocFromHeapInternal(NNSFndHeapHandle heap, u32 size, s32 alignment, Heap return ptr; } -void AllocFail(void) { +static void AllocFail(void) { if (sub_02031810() != 0) { PrintErrorMessageAndReset(); } } -void *AllocFromHeap(HeapID heapId, u32 size) { +void *Heap_Alloc(enum HeapID heapID, u32 size) { void *ptr = NULL; - if ((u32)heapId < sHeapInfo.totalNumHeaps) { - u8 index = sHeapInfo.heapIdxs[heapId]; - ptr = AllocFromHeapInternal(sHeapInfo.heapHandles[index], size, 4, heapId); + + if ((u32)heapID < sHeapInfo.totalNumHeaps) { + u8 index = sHeapInfo.heapIdxs[heapID]; + ptr = AllocFromHeapInternal(sHeapInfo.heapHandles[index], size, 4, heapID); } + if (ptr != NULL) { - sHeapInfo.numMemBlocks[heapId]++; + sHeapInfo.numMemBlocks[heapID]++; } else { AllocFail(); } @@ -219,15 +219,16 @@ void *AllocFromHeap(HeapID heapId, u32 size) { return ptr; } -void *AllocFromHeapAtEnd(HeapID heapId, u32 size) { +void *Heap_AllocAtEnd(enum HeapID heapID, u32 size) { void *ptr = NULL; - if ((u32)heapId < sHeapInfo.totalNumHeaps) { - u8 index = sHeapInfo.heapIdxs[heapId]; - ptr = AllocFromHeapInternal(sHeapInfo.heapHandles[index], size, -4, heapId); + + if ((u32)heapID < sHeapInfo.totalNumHeaps) { + u8 index = sHeapInfo.heapIdxs[heapID]; + ptr = AllocFromHeapInternal(sHeapInfo.heapHandles[index], size, -4, heapID); } if (ptr != NULL) { - sHeapInfo.numMemBlocks[heapId]++; + sHeapInfo.numMemBlocks[heapID]++; } else { AllocFail(); } @@ -235,89 +236,91 @@ void *AllocFromHeapAtEnd(HeapID heapId, u32 size) { return ptr; } -void FreeToHeap(void *ptr) { +void Heap_Free(void *ptr) { ptr -= sizeof(MemoryBlock); - HeapID heapId = (HeapID)(((MemoryBlock *)ptr)->heapId); + enum HeapID heapID = (enum HeapID)(((MemoryBlock *)ptr)->heapID); - if ((u32)heapId < sHeapInfo.totalNumHeaps) { - u8 index = sHeapInfo.heapIdxs[heapId]; + if ((u32)heapID < sHeapInfo.totalNumHeaps) { + u8 index = sHeapInfo.heapIdxs[heapID]; NNSFndHeapHandle heap = sHeapInfo.heapHandles[index]; + GF_ASSERT(heap != NULL); - if (sHeapInfo.numMemBlocks[heapId] == 0) { - GF_heap_c_dummy_return_true(heapId); + if (sHeapInfo.numMemBlocks[heapID] == 0) { + GF_heap_c_dummy_return_true(heapID); } - GF_ASSERT(sHeapInfo.numMemBlocks[heapId] != 0); - sHeapInfo.numMemBlocks[heapId]--; - OSIntrMode intr_mode = OS_DisableInterrupts(); + GF_ASSERT(sHeapInfo.numMemBlocks[heapID] != 0); + + sHeapInfo.numMemBlocks[heapID]--; + + OSIntrMode intrMode = OS_DisableInterrupts(); NNS_FndFreeToExpHeap(heap, ptr); - OS_RestoreInterrupts(intr_mode); + OS_RestoreInterrupts(intrMode); return; } - GF_ASSERT(0); + GF_ASSERT(FALSE); } -void FreeToHeapExplicit(HeapID heapId, void *ptr) { +void Heap_FreeExplicit(enum HeapID heapID, void *ptr) { GF_ASSERT(OS_GetProcMode() != OS_PROCMODE_IRQ); - if ((u32)heapId < sHeapInfo.totalNumHeaps) { - u8 index = sHeapInfo.heapIdxs[heapId]; + if ((u32)heapID < sHeapInfo.totalNumHeaps) { + u8 index = sHeapInfo.heapIdxs[heapID]; NNSFndHeapHandle heap = sHeapInfo.heapHandles[index]; + GF_ASSERT(heap != NULL); ptr -= sizeof(MemoryBlock); - GF_ASSERT(((MemoryBlock *)ptr)->heapId == heapId); + GF_ASSERT(((MemoryBlock *)ptr)->heapID == heapID); NNS_FndFreeToExpHeap(heap, ptr); - GF_ASSERT(sHeapInfo.numMemBlocks[heapId] != 0); - - sHeapInfo.numMemBlocks[heapId]--; + GF_ASSERT(sHeapInfo.numMemBlocks[heapID] != 0); + sHeapInfo.numMemBlocks[heapID]--; return; } - GF_ASSERT(0); + GF_ASSERT(FALSE); } -u32 GF_ExpHeap_FndGetTotalFreeSize(HeapID heapId) { - if ((u32)heapId < sHeapInfo.totalNumHeaps) { - u8 index = sHeapInfo.heapIdxs[heapId]; +u32 HeapExp_FndGetTotalFreeSize(enum HeapID heapID) { + if ((u32)heapID < sHeapInfo.totalNumHeaps) { + u8 index = sHeapInfo.heapIdxs[heapID]; return NNS_FndGetTotalFreeSizeForExpHeap(sHeapInfo.heapHandles[index]); } - GF_ASSERT(0); + GF_ASSERT(FALSE); return 0; } -void GF_ExpHeap_FndInitAllocator(NNSFndAllocator *pAllocator, HeapID heapId, int alignment) { - if ((u32)heapId < sHeapInfo.totalNumHeaps) { - - u8 index = sHeapInfo.heapIdxs[heapId]; +void HeapExp_FndInitAllocator(NNSFndAllocator *pAllocator, enum HeapID heapID, int alignment) { + if ((u32)heapID < sHeapInfo.totalNumHeaps) { + u8 index = sHeapInfo.heapIdxs[heapID]; NNS_FndInitAllocatorForExpHeap(pAllocator, sHeapInfo.heapHandles[index], alignment); return; } - GF_ASSERT(0); + GF_ASSERT(FALSE); } -void ReallocFromHeap(void *ptr, u32 newSize) { +void Heap_Realloc(void *ptr, u32 newSize) { GF_ASSERT(OS_GetProcMode() != OS_PROCMODE_IRQ); newSize += sizeof(MemoryBlock); ptr -= sizeof(MemoryBlock); - if (NNS_FndGetSizeForMBlockExpHeap(ptr) >= newSize) { - u32 heapId = ((MemoryBlock *)ptr)->heapId; // purposefully left as u32, using HeapID casues fuckery with regalloc - u8 index = sHeapInfo.heapIdxs[heapId]; + if (NNS_FndGetSizeForMBlockExpHeap(ptr) >= newSize) { + u32 heapID = ((MemoryBlock *)ptr)->heapID; // purposefully left as u32, using HeapID casues fuckery with regalloc + u8 index = sHeapInfo.heapIdxs[heapID]; NNS_FndResizeForMBlockExpHeap(sHeapInfo.heapHandles[index], ptr, newSize); return; } - GF_ASSERT(0); + GF_ASSERT(FALSE); } -BOOL GF_heap_c_dummy_return_true(HeapID heapId) { -#pragma unused(heapId) +BOOL GF_heap_c_dummy_return_true(enum HeapID heapID) { +#pragma unused(heapID) return TRUE; } diff --git a/arm9/src/itemtool.c b/arm9/src/itemtool.c index d4057c725..86e491d0a 100644 --- a/arm9/src/itemtool.c +++ b/arm9/src/itemtool.c @@ -742,39 +742,39 @@ int sub_0206E70C() { return 0; } -void *LoadItemDataOrGfx(u16 a0, u16 a1, HeapID heapId) { +void *LoadItemDataOrGfx(u16 a0, u16 a1, enum HeapID heapID) { if (a0 > NELEMS(sItemIndexMappings) - 1) { a0 = 0; } switch (a1) { case 0: - return AllocAndReadWholeNarcMemberByIdPair(NARC_ITEMTOOL_ITEMDATA_ITEM_DATA, sItemIndexMappings[a0][0], heapId); + return AllocAndReadWholeNarcMemberByIdPair(NARC_ITEMTOOL_ITEMDATA_ITEM_DATA, sItemIndexMappings[a0][0], heapID); case 1: - return AllocAndReadWholeNarcMemberByIdPair(NARC_ITEMTOOL_ITEMDATA_ITEM_ICON, sItemIndexMappings[a0][1], heapId); + return AllocAndReadWholeNarcMemberByIdPair(NARC_ITEMTOOL_ITEMDATA_ITEM_ICON, sItemIndexMappings[a0][1], heapID); case 2: - return AllocAndReadWholeNarcMemberByIdPair(NARC_ITEMTOOL_ITEMDATA_ITEM_ICON, sItemIndexMappings[a0][2], heapId); + return AllocAndReadWholeNarcMemberByIdPair(NARC_ITEMTOOL_ITEMDATA_ITEM_ICON, sItemIndexMappings[a0][2], heapID); default: return NULL; } } -void GetItemNameIntoString(struct String *dest, u16 item_id, HeapID heapId) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0344_bin, heapId); +void GetItemNameIntoString(struct String *dest, u16 item_id, enum HeapID heapID) { + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0344_bin, heapID); ReadMsgDataIntoString(msgData, item_id, dest); DestroyMsgData(msgData); } -void GetItemDescIntoString(struct String *dest, u16 item_id, HeapID heapId) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0343_bin, heapId); +void GetItemDescIntoString(struct String *dest, u16 item_id, enum HeapID heapID) { + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0343_bin, heapID); ReadMsgDataIntoString(msgData, item_id, dest); DestroyMsgData(msgData); } -u32 GetItemAttr(u16 item, u32 attr, HeapID heapId) { +u32 GetItemAttr(u16 item, u32 attr, enum HeapID heapID) { u32 ret; - struct ItemData *itemData = (struct ItemData *)LoadItemDataOrGfx(item, 0, heapId); + struct ItemData *itemData = (struct ItemData *)LoadItemDataOrGfx(item, 0, heapID); ret = GetItemAttr_PreloadedItemData(itemData, attr); - FreeToHeapExplicit(heapId, itemData); + Heap_FreeExplicit(heapID, itemData); return ret; } @@ -998,8 +998,8 @@ u8 ItemIsBitter(u16 item_id) { return item_id == ITEM_ENERGYPOWDER || item_id == ITEM_ENERGY_ROOT || item_id == ITEM_HEAL_POWDER || item_id == ITEM_REVIVAL_HERB; } -struct ItemData *LoadAllItemData(HeapID heapId) { - return AllocAndReadFromNarcMemberByIdPair(NARC_ITEMTOOL_ITEMDATA_ITEM_DATA, 0, heapId, 0, sizeof(struct ItemData) * GetItemIndexMapping(ITEM_SECRETPOTION, 0)); +struct ItemData *LoadAllItemData(enum HeapID heapID) { + return AllocAndReadFromNarcMemberByIdPair(NARC_ITEMTOOL_ITEMDATA_ITEM_DATA, 0, heapID, 0, sizeof(struct ItemData) * GetItemIndexMapping(ITEM_SECRETPOTION, 0)); } struct ItemData *GetItemDataPtrFromArray(struct ItemData *a0, u16 item_id) { diff --git a/arm9/src/list_menu.c b/arm9/src/list_menu.c index de25faa51..b68886971 100644 --- a/arm9/src/list_menu.c +++ b/arm9/src/list_menu.c @@ -12,17 +12,17 @@ void ListMenuDrawCursor(struct ListMenu *list); BOOL ListMenuChangeSelection(struct ListMenu *list, u8 updateCursorAndCallCallback, u8 count, u8 movingDown); void ListMenuCallSelectionChangedCallback(struct ListMenu *list, u8 onInit); -struct ListMenu *ListMenuInit(const struct ListMenuTemplate *template, u16 cursorPos, u16 itemsAbove, u8 heapId) { - struct ListMenu *list = AllocFromHeap((HeapID)heapId, sizeof(struct ListMenu)); +struct ListMenu *ListMenuInit(const struct ListMenuTemplate *template, u16 cursorPos, u16 itemsAbove, u8 heapID) { + struct ListMenu *list = Heap_Alloc((enum HeapID)heapID, sizeof(struct ListMenu)); list->template = *template; - list->cursor = ListMenuCursorNew((HeapID)heapId); + list->cursor = ListMenuCursorNew((enum HeapID)heapID); list->cursorPos = cursorPos; list->itemsAbove = itemsAbove; list->unk_30 = 0; list->unk_31 = 0; list->taskId = 0xFF; list->unk_33 = 0; - list->heapId = heapId; + list->heapID = heapID; list->cursorPal = list->template.cursorPal; list->fillValue = list->template.fillValue; list->cursorShadowPal = list->template.cursorShadowPal; @@ -99,7 +99,7 @@ void DestroyListMenu(struct ListMenu *list, u16 *cursorPos, u16 *itemsAbove) { *itemsAbove = list->itemsAbove; } DestroyListMenuCursorObj(list->cursor); - FreeToHeapExplicit((HeapID)list->heapId, list); + Heap_FreeExplicit((enum HeapID)list->heapID, list); } void RedrawListMenu(struct ListMenu *list) { diff --git a/arm9/src/list_menu_items.c b/arm9/src/list_menu_items.c index 58e2cf0eb..a470e1314 100644 --- a/arm9/src/list_menu_items.c +++ b/arm9/src/list_menu_items.c @@ -7,28 +7,28 @@ void ListMenuItems_DestroyMenuStrings(struct ListMenuItem *items); -struct ListMenuItem *ListMenuItems_New(u32 count, HeapID heapId) { +struct ListMenuItem *ListMenuItems_New(u32 count, enum HeapID heapID) { s32 i; - struct ListMenuItem *ret = AllocFromHeap(heapId, (count + 1) * sizeof(struct ListMenuItem)); + struct ListMenuItem *ret = Heap_Alloc(heapID, (count + 1) * sizeof(struct ListMenuItem)); if (ret != NULL) { for (i = 0; i < count; i++) { ret[i].text = NULL; ret[i].value = 0; } ret[i].text = (struct String *)-1u; - ret[i].value = (s32)heapId; + ret[i].value = (s32)heapID; } return ret; } void ListMenuItems_Delete(struct ListMenuItem *items) { ListMenuItems_DestroyMenuStrings(items); - FreeToHeap(items); + Heap_Free(items); } void ListMenuItems_AppendFromMsgData(struct ListMenuItem *items, struct MsgData *msgData, u32 msgNo, s32 value) { - HeapID heapId; - struct ListMenuItem *newItem = ListMenuItems_SeekEnd(items, &heapId); + enum HeapID heapID; + struct ListMenuItem *newItem = ListMenuItems_SeekEnd(items, &heapID); if (newItem != NULL) { newItem->text = NewString_ReadMsgData(msgData, msgNo); newItem->value = value; @@ -36,24 +36,24 @@ void ListMenuItems_AppendFromMsgData(struct ListMenuItem *items, struct MsgData } void ListMenuItems_AddItem(struct ListMenuItem *items, struct String *str, s32 value) { - HeapID heapId; - struct ListMenuItem *newItem = ListMenuItems_SeekEnd(items, &heapId); + enum HeapID heapID; + struct ListMenuItem *newItem = ListMenuItems_SeekEnd(items, &heapID); if (newItem != NULL) { - newItem->text = StringDup(str, heapId); + newItem->text = StringDup(str, heapID); newItem->value = value; } } void ListMenuItems_CopyItem(struct ListMenuItem *items, struct ListMenuItem *src) { - HeapID heapId; - struct ListMenuItem *newItem = ListMenuItems_SeekEnd(items, &heapId); + enum HeapID heapID; + struct ListMenuItem *newItem = ListMenuItems_SeekEnd(items, &heapID); if (newItem != NULL) { newItem->text = src->text; newItem->value = src->value; } } -struct ListMenuItem *ListMenuItems_SeekEnd(struct ListMenuItem *items, HeapID *heapIdPtr) { +struct ListMenuItem *ListMenuItems_SeekEnd(struct ListMenuItem *items, enum HeapID *heapIdPtr) { struct ListMenuItem *ret; for (; items->text != NULL; items++) { if (items->text == (struct String *)-1u) { @@ -64,7 +64,7 @@ struct ListMenuItem *ListMenuItems_SeekEnd(struct ListMenuItem *items, HeapID *h ret = items; for (; items->text != (struct String *)-1u; items++) ; - *heapIdPtr = (HeapID)items->value; + *heapIdPtr = (enum HeapID)items->value; return ret; } diff --git a/arm9/src/mail.c b/arm9/src/mail.c index d663e3e3b..e0584a12c 100644 --- a/arm9/src/mail.c +++ b/arm9/src/mail.c @@ -32,8 +32,8 @@ BOOL Mail_TypeIsValid(struct Mail *mail) { return mail->mail_type <= 11; } -struct Mail *Mail_New(HeapID heapId) { - struct Mail *ret = (struct Mail *)AllocFromHeapAtEnd(heapId, sizeof(struct Mail)); +struct Mail *Mail_New(enum HeapID heapID) { + struct Mail *ret = (struct Mail *)Heap_AllocAtEnd(heapID, sizeof(struct Mail)); Mail_Init(ret); return ret; } @@ -185,10 +185,10 @@ s32 Mailbox_CountMessages(struct Mail *mail, BOOL r1) { } } -struct Mail *Mailbox_AllocAndFetchMailI(struct Mail *mail, BOOL r1, s32 idx, HeapID heapId) { +struct Mail *Mailbox_AllocAndFetchMailI(struct Mail *mail, BOOL r1, s32 idx, enum HeapID heapID) { struct Mail *ret; mail = Mailbox_GetPtrToSlotI(mail, r1, idx); - ret = Mail_New(heapId); + ret = Mail_New(heapID); if (mail != NULL) { Mail_Copy(mail, ret); } diff --git a/arm9/src/mail_message.c b/arm9/src/mail_message.c index a2e4dd24b..ff077136a 100644 --- a/arm9/src/mail_message.c +++ b/arm9/src/mail_message.c @@ -72,9 +72,9 @@ void MailMsg_Init_FromTemplate(struct MailMessage *mailMsg, u32 a1) { } } -struct String *MailMsg_GetExpandedString(struct MailMessage *mailMsg, HeapID heapId) { +struct String *MailMsg_GetExpandedString(struct MailMessage *mailMsg, enum HeapID heapID) { s32 i; - MessageFormat *messageFormat = MessageFormat_New(heapId); + MessageFormat *messageFormat = MessageFormat_New(heapID); struct MsgData *msgData; struct String *ret; for (i = 0; i < MAILMSG_FIELDS_MAX; i++) { @@ -83,15 +83,15 @@ struct String *MailMsg_GetExpandedString(struct MailMessage *mailMsg, HeapID hea } BufferECWord(messageFormat, (u32)i, mailMsg->fields[i]); } - msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, sMessageBanks[mailMsg->msg_bank], heapId); - ret = ReadMsgData_ExpandPlaceholders(messageFormat, msgData, mailMsg->msg_no, heapId); + msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, sMessageBanks[mailMsg->msg_bank], heapID); + ret = ReadMsgData_ExpandPlaceholders(messageFormat, msgData, mailMsg->msg_no, heapID); DestroyMsgData(msgData); MessageFormat_Delete(messageFormat); return ret; } -struct String *MailMsg_GetRawString(struct MailMessage *mailMsg, HeapID heapId) { - return ReadMsgData_NewNarc_NewString(NARC_MSGDATA_MSG, sMessageBanks[mailMsg->msg_bank], mailMsg->msg_no, heapId); +struct String *MailMsg_GetRawString(struct MailMessage *mailMsg, enum HeapID heapID) { + return ReadMsgData_NewNarc_NewString(NARC_MSGDATA_MSG, sMessageBanks[mailMsg->msg_bank], mailMsg->msg_no, heapID); } BOOL MailMsg_IsInit(struct MailMessage *mailMsg) { diff --git a/arm9/src/map_matrix.c b/arm9/src/map_matrix.c index ec3152b8a..7aa9088b6 100644 --- a/arm9/src/map_matrix.c +++ b/arm9/src/map_matrix.c @@ -55,11 +55,11 @@ static void MapMatrix_MapMatrixData_Load( MI_CpuCopy8( cursor, map_matrix->maps.data, map_matrix->width * map_matrix->height * sizeof(u16)); - FreeToHeap(buffer); + Heap_Free(buffer); } struct MapMatrix *MapMatrix_New(void) { - struct MapMatrix *map_matrix = AllocFromHeap(HEAP_ID_FIELD, sizeof(struct MapMatrix)); + struct MapMatrix *map_matrix = Heap_Alloc(HEAP_ID_FIELD, sizeof(struct MapMatrix)); map_matrix->width = 0; map_matrix->height = 0; @@ -79,7 +79,7 @@ void MapMatrix_Load(u16 map_id, struct MapMatrix *map_matrix) { } void MapMatrix_Free(struct MapMatrix *map_matrix) { - FreeToHeap(map_matrix); + Heap_Free(map_matrix); } u16 MapMatrix_GetMapData(s32 map_id, struct MapMatrix *map_matrix) { @@ -131,9 +131,9 @@ u32 MapMatrix_GetMapAltitude( return map_matrix->data.altitudes[y * matrix_width + x]; } -struct MapData *MapMatrix_MapData_New(HeapID heapId) { - struct MapData *map_data = AllocFromHeap(heapId, sizeof(struct MapData)); - void *buffer = AllocAtEndAndReadWholeNarcMemberByIdPair(NARC_FIELDDATA_MAPMATRIX_MAP_MATRIX, 0, heapId); +struct MapData *MapMatrix_MapData_New(enum HeapID heapID) { + struct MapData *map_data = Heap_Alloc(heapID, sizeof(struct MapData)); + void *buffer = AllocAtEndAndReadWholeNarcMemberByIdPair(NARC_FIELDDATA_MAPMATRIX_MAP_MATRIX, 0, heapID); u8 *cursor = (u8 *)buffer; cursor += 4; @@ -142,14 +142,14 @@ struct MapData *MapMatrix_MapData_New(HeapID heapId) { cursor += name_length; MI_CpuCopy8(cursor, map_data, sizeof(struct MapData)); - FreeToHeap(buffer); + Heap_Free(buffer); return map_data; } void MapMatrix_MapData_Free(struct MapData *map_data) { GF_ASSERT(map_data != NULL); - FreeToHeap(map_data); + Heap_Free(map_data); } u16 MapMatrix_MapData_GetData(struct MapData *map_data, s32 x, s32 y) { diff --git a/arm9/src/map_object.c b/arm9/src/map_object.c index d1a95d98b..d8f1d9a7e 100644 --- a/arm9/src/map_object.c +++ b/arm9/src/map_object.c @@ -155,8 +155,8 @@ MapObjectManager *MapObjectManager_Init(FieldSystem *fieldSystem, u32 objectCoun } void MapObjectManager_Delete(MapObjectManager *manager) { - FreeToHeapExplicit(HEAP_ID_FIELD, MapObjectManager_GetObjects(manager)); - FreeToHeapExplicit(HEAP_ID_FIELD, manager); + Heap_FreeExplicit(HEAP_ID_FIELD, MapObjectManager_GetObjects(manager)); + Heap_FreeExplicit(HEAP_ID_FIELD, manager); } void sub_020573C8(MapObjectManager *manager, u32 unused, u32 mapId, u32 objectCount, ObjectEvent *objectEvents) { @@ -185,11 +185,11 @@ void sub_020573C8(MapObjectManager *manager, u32 unused, u32 mapId, u32 objectCo static MapObjectManager *MapObjectManager_New(u32 objectCount) { LocalMapObject *objects; - MapObjectManager *manager = AllocFromHeap(HEAP_ID_FIELD, sizeof(MapObjectManager)); + MapObjectManager *manager = Heap_Alloc(HEAP_ID_FIELD, sizeof(MapObjectManager)); GF_ASSERT(manager != NULL); memset(manager, 0, sizeof(MapObjectManager)); - objects = AllocFromHeap(HEAP_ID_FIELD, objectCount * sizeof(LocalMapObject)); + objects = Heap_Alloc(HEAP_ID_FIELD, objectCount * sizeof(LocalMapObject)); GF_ASSERT(objects != NULL); memset(objects, 0, objectCount * sizeof(LocalMapObject)); @@ -512,11 +512,11 @@ static void MapObject_ConvertXZToPositionVec(LocalMapObject *object) { void MapObject_CreateFromMultipleObjectEvents(MapObjectManager *manager, u32 mapNo, u32 objectEventCount, ObjectEvent *objectEvents) { GF_ASSERT(objectEventCount != 0); - ObjectEvent *objectEventsCopy = AllocFromHeapAtEnd(HEAP_ID_FIELD, objectEventCount * sizeof(ObjectEvent)); + ObjectEvent *objectEventsCopy = Heap_AllocAtEnd(HEAP_ID_FIELD, objectEventCount * sizeof(ObjectEvent)); GF_ASSERT(objectEventsCopy != NULL); memcpy(objectEventsCopy, objectEvents, objectEventCount * sizeof(ObjectEvent)); - MapObjectInitArgs *args = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(MapObjectInitArgs)); + MapObjectInitArgs *args = Heap_AllocAtEnd(HEAP_ID_FIELD, sizeof(MapObjectInitArgs)); GF_ASSERT(args != NULL); args->mapNo = mapNo; args->objectEventCount = objectEventCount; @@ -538,8 +538,8 @@ static void MapObject_CreateFromInitArgs(MapObjectInitArgs *args) { args->index++; } while (args->index < args->objectEventCount); - FreeToHeapExplicit(HEAP_ID_FIELD, args->objectEvents); - FreeToHeapExplicit(HEAP_ID_FIELD, args); + Heap_FreeExplicit(HEAP_ID_FIELD, args->objectEvents); + Heap_FreeExplicit(HEAP_ID_FIELD, args); } static LocalMapObject *MapObjectManager_GetFirstInactiveObject(MapObjectManager *manager) { diff --git a/arm9/src/message_format.c b/arm9/src/message_format.c index 3c9d68336..739984641 100644 --- a/arm9/src/message_format.c +++ b/arm9/src/message_format.c @@ -43,25 +43,25 @@ const u16 UNK_020ECE64[] = { 0 }; -MessageFormat *MessageFormat_New(HeapID heapId) { - return MessageFormat_New_Custom(8, 32, heapId); +MessageFormat *MessageFormat_New(enum HeapID heapID) { + return MessageFormat_New_Custom(8, 32, heapID); } -MessageFormat *MessageFormat_New_Custom(u32 nstr, u32 strlen, HeapID heapId) { +MessageFormat *MessageFormat_New_Custom(u32 nstr, u32 strlen, enum HeapID heapID) { GF_ASSERT(nstr != 0); GF_ASSERT(strlen != 0); - MessageFormat *messageFormat = AllocFromHeapAtEnd(heapId, sizeof(MessageFormat)); + MessageFormat *messageFormat = Heap_AllocAtEnd(heapID, sizeof(MessageFormat)); if (messageFormat != NULL) { messageFormat->count = nstr; - messageFormat->heapId = heapId; - messageFormat->buffer = String_New(strlen, heapId); + messageFormat->heapID = heapID; + messageFormat->buffer = String_New(strlen, heapID); if (messageFormat->buffer != NULL) { - messageFormat->fields = AllocFromHeapAtEnd(heapId, nstr * sizeof(MessageFormatFields)); + messageFormat->fields = Heap_AllocAtEnd(heapID, nstr * sizeof(MessageFormatFields)); if (messageFormat->fields != NULL) { s32 i; for (i = 0; i < nstr; i++) { MessageFormat_InitFields(&messageFormat->fields[i]); - messageFormat->fields[i].msg = String_New(strlen, heapId); + messageFormat->fields[i].msg = String_New(strlen, heapID); if (messageFormat->fields[i].msg == NULL) { break; } @@ -84,13 +84,13 @@ void MessageFormat_Delete(MessageFormat *messageFormat) { } String_Delete(messageFormat->fields[i].msg); } - FreeToHeap(messageFormat->fields); + Heap_Free(messageFormat->fields); } if (messageFormat->buffer != NULL) { String_Delete(messageFormat->buffer); } messageFormat->count = 0; - FreeToHeap(messageFormat); + Heap_Free(messageFormat); } void MessageFormat_InitFields(MessageFormatFields *fields) { @@ -126,7 +126,7 @@ void BufferRivalsName(MessageFormat *messageFormat, u32 idx, struct SaveData *sa void BufferFriendsName(MessageFormat *messageFormat, u32 idx, struct SaveData *save) { PlayerProfile *profile = Save_PlayerData_GetProfile(save); - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0497_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0497_bin, messageFormat->heapID); if (PlayerProfile_GetTrainerGender(profile) == PLAYER_GENDER_MALE) { ReadMsgDataIntoString(msgData, narc_0497_00001, messageFormat->buffer); // Dawn } else { @@ -137,7 +137,7 @@ void BufferFriendsName(MessageFormat *messageFormat, u32 idx, struct SaveData *s } void BufferBoxMonSpeciesName(MessageFormat *messageFormat, u32 idx, struct BoxPokemon *mon) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0362_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0362_bin, messageFormat->heapID); ReadMsgDataIntoString(msgData, GetBoxMonData(mon, MON_DATA_SPECIES, NULL), messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); DestroyMsgData(msgData); @@ -148,7 +148,7 @@ void BufferBoxMonSpeciesNameWithArticle(MessageFormat *messageFormat, u32 idx, s } void BufferSpeciesNameWithArticle(MessageFormat *messageFormat, u32 idx, u32 species) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0363_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0363_bin, messageFormat->heapID); ReadMsgDataIntoString(msgData, species, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); DestroyMsgData(msgData); @@ -170,7 +170,7 @@ void BufferIntegerAsString(MessageFormat *messageFormat, u32 idx, s32 num, u32 n } void BufferMoveName(MessageFormat *messageFormat, u32 idx, u32 move) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0588_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0588_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, move, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -179,7 +179,7 @@ void BufferMoveName(MessageFormat *messageFormat, u32 idx, u32 move) { } void BufferRibbonNameOrDesc(MessageFormat *messageFormat, u32 idx, u32 ribbon) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0484_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0484_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, ribbon, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -188,7 +188,7 @@ void BufferRibbonNameOrDesc(MessageFormat *messageFormat, u32 idx, u32 ribbon) { } void BufferAbilityName(MessageFormat *messageFormat, u32 idx, u32 ability) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0552_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0552_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, ability, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -197,14 +197,14 @@ void BufferAbilityName(MessageFormat *messageFormat, u32 idx, u32 ability) { } void BufferNatureName(MessageFormat *messageFormat, u32 idx, u32 nature) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0190_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0190_bin, messageFormat->heapID); ReadMsgDataIntoString(msgData, nature, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); DestroyMsgData(msgData); } void BufferItemName(MessageFormat *messageFormat, u32 idx, u32 item) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0344_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0344_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, item, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -213,7 +213,7 @@ void BufferItemName(MessageFormat *messageFormat, u32 idx, u32 item) { } void BufferItemNameWithIndefArticle(MessageFormat *messageFormat, u32 idx, u32 item) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0346_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0346_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, item, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -222,7 +222,7 @@ void BufferItemNameWithIndefArticle(MessageFormat *messageFormat, u32 idx, u32 i } void BufferItemNamePlural(MessageFormat *messageFormat, u32 idx, u32 item) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0347_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0347_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, item, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -231,7 +231,7 @@ void BufferItemNamePlural(MessageFormat *messageFormat, u32 idx, u32 item) { } void BufferPocketName(MessageFormat *messageFormat, u32 idx, u32 pocket) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0349_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0349_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, pocket, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -240,7 +240,7 @@ void BufferPocketName(MessageFormat *messageFormat, u32 idx, u32 pocket) { } void BufferTypeName(MessageFormat *messageFormat, u32 idx, u32 type) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0565_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0565_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, type, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -249,7 +249,7 @@ void BufferTypeName(MessageFormat *messageFormat, u32 idx, u32 type) { } void BufferStatName(MessageFormat *messageFormat, u32 idx, u32 stat) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0495_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0495_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, stat, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -258,7 +258,7 @@ void BufferStatName(MessageFormat *messageFormat, u32 idx, u32 stat) { } void BufferStatusName(MessageFormat *messageFormat, u32 idx, u32 status) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0205_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0205_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, status, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -267,7 +267,7 @@ void BufferStatusName(MessageFormat *messageFormat, u32 idx, u32 status) { } void BufferFlavorDislikeText(MessageFormat *messageFormat, u32 idx, u32 flavor) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0548_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0548_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, flavor, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -276,7 +276,7 @@ void BufferFlavorDislikeText(MessageFormat *messageFormat, u32 idx, u32 flavor) } void BufferLandmarkName(MessageFormat *messageFormat, u32 idx, u32 landmark) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0382_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0382_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, landmark, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -285,7 +285,7 @@ void BufferLandmarkName(MessageFormat *messageFormat, u32 idx, u32 landmark) { } void BufferPoketchAppName(MessageFormat *messageFormat, u32 idx, u32 app) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0406_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0406_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, app, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -294,7 +294,7 @@ void BufferPoketchAppName(MessageFormat *messageFormat, u32 idx, u32 app) { } void BufferTrainerClassName(MessageFormat *messageFormat, u32 idx, u32 trclass) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0560_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0560_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, trclass, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -303,7 +303,7 @@ void BufferTrainerClassName(MessageFormat *messageFormat, u32 idx, u32 trclass) } void BufferTrainerClassNameWithArticle(MessageFormat *messageFormat, u32 idx, u32 trclass) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0561_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0561_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, trclass, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -312,7 +312,7 @@ void BufferTrainerClassNameWithArticle(MessageFormat *messageFormat, u32 idx, u3 } void BufferTrainerClassNameFromDataStruct(MessageFormat *messageFormat, u32 idx, Trainer *tr) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0560_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0560_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, tr->data.trainerClass, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -321,7 +321,7 @@ void BufferTrainerClassNameFromDataStruct(MessageFormat *messageFormat, u32 idx, } void BufferTrainerName(MessageFormat *messageFormat, u32 idx, u32 msgno) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0559_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0559_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, msgno, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -335,7 +335,7 @@ void BufferTrainerNameFromDataStruct(MessageFormat *messageFormat, u32 idx, Trai } void BufferUndergroundItemName(MessageFormat *messageFormat, u32 idx, u32 item) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0569_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0569_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, item, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -344,7 +344,7 @@ void BufferUndergroundItemName(MessageFormat *messageFormat, u32 idx, u32 item) } void BufferUndergroundItemNameWithArticle(MessageFormat *messageFormat, u32 idx, u32 item) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0570_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0570_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, item, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -353,7 +353,7 @@ void BufferUndergroundItemNameWithArticle(MessageFormat *messageFormat, u32 idx, } void BufferUndergroundTrapName(MessageFormat *messageFormat, u32 idx, u32 trap) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0571_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0571_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, trap, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -362,7 +362,7 @@ void BufferUndergroundTrapName(MessageFormat *messageFormat, u32 idx, u32 trap) } void BufferUndergroundTrapNameWithArticle(MessageFormat *messageFormat, u32 idx, u32 trap) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0572_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0572_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, trap, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -371,7 +371,7 @@ void BufferUndergroundTrapNameWithArticle(MessageFormat *messageFormat, u32 idx, } void BufferContestJudgeName(MessageFormat *messageFormat, u32 idx, u32 judge) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0194_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0194_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, judge, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -380,7 +380,7 @@ void BufferContestJudgeName(MessageFormat *messageFormat, u32 idx, u32 judge) { } void BufferContestMessage(MessageFormat *messageFormat, u32 idx, u32 msg) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0191_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0191_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, msg, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -389,7 +389,7 @@ void BufferContestMessage(MessageFormat *messageFormat, u32 idx, u32 msg) { } void BufferContestMessage2(MessageFormat *messageFormat, u32 idx, u32 msg) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0191_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0191_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, msg, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -398,7 +398,7 @@ void BufferContestMessage2(MessageFormat *messageFormat, u32 idx, u32 msg) { } void BufferInterviewQuestion(MessageFormat *messageFormat, u32 idx, u32 question) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0574_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0574_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, question, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -407,7 +407,7 @@ void BufferInterviewQuestion(MessageFormat *messageFormat, u32 idx, u32 question } void BufferInterviewAnswer(MessageFormat *messageFormat, u32 idx, u32 answer) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0573_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0573_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, answer, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -416,7 +416,7 @@ void BufferInterviewAnswer(MessageFormat *messageFormat, u32 idx, u32 answer) { } void BufferDecorationName(MessageFormat *messageFormat, u32 idx, u32 decor) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0567_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0567_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, decor, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -425,7 +425,7 @@ void BufferDecorationName(MessageFormat *messageFormat, u32 idx, u32 decor) { } void BufferDecorationNameWithArticle(MessageFormat *messageFormat, u32 idx, u32 decor) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0568_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0568_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, decor, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -434,7 +434,7 @@ void BufferDecorationNameWithArticle(MessageFormat *messageFormat, u32 idx, u32 } void BufferGenderSymbol(MessageFormat *messageFormat, u32 idx, u32 gender) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0199_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0199_bin, messageFormat->heapID); switch (gender) { case 0: ReadMsgDataIntoString(msgData, narc_0199_00068, messageFormat->buffer); // ♂ @@ -456,7 +456,7 @@ void BufferBoxName(MessageFormat *messageFormat, u32 idx, struct PCStorage *pc, } void BufferGymName(MessageFormat *messageFormat, u32 idx, u32 gym) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0331_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0331_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, gym, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -465,7 +465,7 @@ void BufferGymName(MessageFormat *messageFormat, u32 idx, u32 gym) { } void BufferTimeOfDayName(MessageFormat *messageFormat, u32 idx, u32 time) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0550_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0550_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, time, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -474,7 +474,7 @@ void BufferTimeOfDayName(MessageFormat *messageFormat, u32 idx, u32 time) { } void BufferCountryName(MessageFormat *messageFormat, u32 idx, u32 country) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0612_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0612_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, country, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -485,7 +485,7 @@ void BufferCountryName(MessageFormat *messageFormat, u32 idx, u32 country) { void BufferCityName(MessageFormat *messageFormat, u32 idx, u32 countryId, u32 cityId) { u32 msgBank = GetCityNamesMsgdataIdByCountry(countryId); if (msgBank != 0 && cityId != 0) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, (s32)msgBank, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, (s32)msgBank, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, cityId, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -500,7 +500,7 @@ void BufferECWord(MessageFormat *messageFormat, u32 idx, u32 ecWordIdx) { } void BufferSealName(MessageFormat *messageFormat, u32 idx, u32 seal) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0010_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0010_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, seal, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -509,7 +509,7 @@ void BufferSealName(MessageFormat *messageFormat, u32 idx, u32 seal) { } void BufferSealNamePlural(MessageFormat *messageFormat, u32 idx, u32 seal) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0011_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0011_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, seal, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -520,7 +520,7 @@ void BufferSealNamePlural(MessageFormat *messageFormat, u32 idx, u32 seal) { void BufferLocationName(MessageFormat *messageFormat, u32 idx, u16 location) { u32 r6 = (u32)sub_02015CC0(location); u32 r4 = (u32)sub_02015CE0(location); - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, UNK_020ECE64[r6], messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, UNK_020ECE64[r6], messageFormat->heapID); if (msgData != NULL) { if (r4 < MsgDataGetCount(msgData)) { ReadMsgDataIntoString(msgData, r4, messageFormat->buffer); @@ -531,7 +531,7 @@ void BufferLocationName(MessageFormat *messageFormat, u32 idx, u16 location) { // Location is invalid. // Fallback: Mystery Zone DestroyMsgData(msgData); - msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0382_bin, messageFormat->heapId); + msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0382_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, narc_0382_00000, messageFormat->buffer); // Mystery Zone SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -541,7 +541,7 @@ void BufferLocationName(MessageFormat *messageFormat, u32 idx, u16 location) { } void BufferPoffinName(MessageFormat *messageFormat, u32 idx, u32 poffin) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0414_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0414_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, poffin, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -550,7 +550,7 @@ void BufferPoffinName(MessageFormat *messageFormat, u32 idx, u32 poffin) { } void BufferFashionName(MessageFormat *messageFormat, u32 idx, u32 fashion) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0338_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0338_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, fashion, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -559,7 +559,7 @@ void BufferFashionName(MessageFormat *messageFormat, u32 idx, u32 fashion) { } void BufferFashionNameWithArticle(MessageFormat *messageFormat, u32 idx, u32 fashion) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0339_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0339_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, fashion, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -568,7 +568,7 @@ void BufferFashionNameWithArticle(MessageFormat *messageFormat, u32 idx, u32 fas } void BufferContestBackgroundName(MessageFormat *messageFormat, u32 idx, u32 bg) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0340_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0340_bin, messageFormat->heapID); if (msgData != NULL) { ReadMsgDataIntoString(msgData, bg, messageFormat->buffer); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -587,7 +587,7 @@ void BufferGroupName(MessageFormat *messageFormat, struct SaveData *save, u32 r5 } void BufferMonthNameAbbr(MessageFormat *messageFormat, u32 idx, u32 month) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0364_bin, messageFormat->heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0364_bin, messageFormat->heapID); if (msgData != NULL) { if (month < 1 || month > 12) { month = 1; @@ -631,10 +631,10 @@ void MessageFormat_ResetBuffers(MessageFormat *messageFormat) { } } -struct UnkStruct_0200B870 *MessagePrinter_New(u32 color1, u32 color2, u32 color3, HeapID heapId) { - struct UnkStruct_0200B870 *sp8 = AllocFromHeap(heapId, sizeof(struct UnkStruct_0200B870)); +struct UnkStruct_0200B870 *MessagePrinter_New(u32 color1, u32 color2, u32 color3, enum HeapID heapID) { + struct UnkStruct_0200B870 *sp8 = Heap_Alloc(heapID, sizeof(struct UnkStruct_0200B870)); if (sp8 != NULL) { - sp8->unk_0 = GfGfxLoader_GetCharData(NARC_GRAPHIC_FONT, NARC_font_narc_0004_NCGR_lz, 1, &sp8->unk_4, heapId); + sp8->unk_0 = GfGfxLoader_GetCharData(NARC_GRAPHIC_FONT, NARC_font_narc_0004_NCGR_lz, 1, &sp8->unk_4, heapID); int i; u8 *ptr = sp8->unk_4->pRawData; for (i = 0; i < sp8->unk_4->szByte; i++) { @@ -676,9 +676,9 @@ struct UnkStruct_0200B870 *MessagePrinter_New(u32 color1, u32 color2, u32 color3 void MessagePrinter_Delete(struct UnkStruct_0200B870 *a0) { if (a0 != NULL) { if (a0->unk_0 != NULL) { - FreeToHeap(a0->unk_0); + Heap_Free(a0->unk_0); } - FreeToHeap(a0); + Heap_Free(a0); } } diff --git a/arm9/src/move_relearner.c b/arm9/src/move_relearner.c index 5be967a3d..4c40c4bf0 100644 --- a/arm9/src/move_relearner.c +++ b/arm9/src/move_relearner.c @@ -4,17 +4,17 @@ #include "pokemon.h" -MoveRelearner *MoveRelearner_New(HeapID heapId) { - MoveRelearner *ret = AllocFromHeap(heapId, sizeof(MoveRelearner)); +MoveRelearner *MoveRelearner_New(enum HeapID heapID) { + MoveRelearner *ret = Heap_Alloc(heapID, sizeof(MoveRelearner)); memset(ret, 0, sizeof(MoveRelearner)); return ret; } void MoveRelearner_Delete(MoveRelearner *moveRelearner) { - FreeToHeap(moveRelearner); + Heap_Free(moveRelearner); } -u16 *MoveRelearner_GetEligibleLevelUpMoves(Pokemon *mon, HeapID heapId) { +u16 *MoveRelearner_GetEligibleLevelUpMoves(Pokemon *mon, enum HeapID heapID) { u16 species = GetMonData(mon, MON_DATA_SPECIES, NULL); u8 form = GetMonData(mon, MON_DATA_FORM, NULL); u8 level = GetMonData(mon, MON_DATA_LEVEL, NULL); @@ -24,8 +24,8 @@ u16 *MoveRelearner_GetEligibleLevelUpMoves(Pokemon *mon, HeapID heapId) { moves[i] = GetMonData(mon, MON_DATA_MOVE1 + i, NULL); } - u16 *tableFromFile = AllocFromHeap(heapId, LEVEL_UP_LEARNSET_MAX * 2); - u16 *returnTable = AllocFromHeap(heapId, LEVEL_UP_LEARNSET_MAX * 2); + u16 *tableFromFile = Heap_Alloc(heapID, LEVEL_UP_LEARNSET_MAX * 2); + u16 *returnTable = Heap_Alloc(heapID, LEVEL_UP_LEARNSET_MAX * 2); LoadLevelUpLearnset_HandleAlternateForm(species, form, tableFromFile); @@ -55,7 +55,7 @@ u16 *MoveRelearner_GetEligibleLevelUpMoves(Pokemon *mon, HeapID heapId) { } } } - FreeToHeap(tableFromFile); + Heap_Free(tableFromFile); return returnTable; } diff --git a/arm9/src/msgdata.c b/arm9/src/msgdata.c index 992739b3d..60f846853 100644 --- a/arm9/src/msgdata.c +++ b/arm9/src/msgdata.c @@ -9,24 +9,24 @@ #include "heap.h" #include "string16.h" -static void *LoadSingleElementFromNarc(NarcId narc_id, s32 file_id, HeapID heapId); +static void *LoadSingleElementFromNarc(NarcId narc_id, s32 file_id, enum HeapID heapID); static void FreeMsgDataRawData(void *data); static void ReadMsgData_ExistingTable_ExistingArray(struct MsgDataTable *table, u32 num, u16 *dest); -static void ReadMsgData_NewNarc_ExistingArray(NarcId narc_id, u32 group, u32 num, HeapID heapId, u16 *dest); +static void ReadMsgData_NewNarc_ExistingArray(NarcId narc_id, u32 group, u32 num, enum HeapID heapID, u16 *dest); static void CopyEncryptedMessage16(u16 *dest, const u16 *src, struct MsgDataAlloc *param); static void ReadMsgData_ExistingTable_ExistingString(struct MsgDataTable *table, u32 num, struct String *dest); -static struct String *ReadMsgData_ExistingTable_NewString(struct MsgDataTable *table, u32 num, HeapID heapId); -static void ReadMsgData_ExistingNarc_ExistingString(NARC *narc, u32 group, u32 num, HeapID heapId, struct String *dest); -static struct String *ReadMsgData_ExistingNarc_NewString(NARC *narc, u32 group, u32 num, HeapID heapId); +static struct String *ReadMsgData_ExistingTable_NewString(struct MsgDataTable *table, u32 num, enum HeapID heapID); +static void ReadMsgData_ExistingNarc_ExistingString(NARC *narc, u32 group, u32 num, enum HeapID heapID, struct String *dest); +static struct String *ReadMsgData_ExistingNarc_NewString(NARC *narc, u32 group, u32 num, enum HeapID heapID); static u16 GetMsgCount_ExistingTable(struct MsgDataTable *tbl); static u16 GetMsgCount_TableFromNarc(NarcId narc_id, s32 file_id); -static void *LoadSingleElementFromNarc(NarcId narc_id, s32 file_id, HeapID heapId) { - return AllocAndReadWholeNarcMemberByIdPair(narc_id, file_id, heapId); +static void *LoadSingleElementFromNarc(NarcId narc_id, s32 file_id, enum HeapID heapID) { + return AllocAndReadWholeNarcMemberByIdPair(narc_id, file_id, heapID); } static void FreeMsgDataRawData(void *data) { - FreeToHeap(data); + Heap_Free(data); } inline static void Decrypt1(struct MsgDataAlloc *arg0, u32 arg1, u32 seed) { @@ -60,8 +60,8 @@ static void ReadMsgData_ExistingTable_ExistingArray(struct MsgDataTable *table, } } -static void ReadMsgData_NewNarc_ExistingArray(NarcId narc_id, u32 group, u32 num, HeapID heapId, u16 *dest) { - NARC *narc = NARC_New(narc_id, heapId); +static void ReadMsgData_NewNarc_ExistingArray(NarcId narc_id, u32 group, u32 num, enum HeapID heapID, u16 *dest) { + NARC *narc = NARC_New(narc_id, heapID); u16 header[2]; struct MsgDataAlloc alloc; if (narc != NULL) { @@ -84,12 +84,12 @@ static void ReadMsgData_ExistingTable_ExistingString(struct MsgDataTable *table, if (num < table->count) { alloc = table->alloc[num]; Decrypt1(&alloc, num, table->key); - buf = AllocFromHeapAtEnd(HEAP_ID_DEFAULT, 2 * alloc.length); + buf = Heap_AllocAtEnd(HEAP_ID_DEFAULT, 2 * alloc.length); if (buf != NULL) { MI_CpuCopy16((char *)table + alloc.offset, buf, 2 * alloc.length); Decrypt2(buf, alloc.length, num); CopyU16ArrayToStringN(dest, buf, alloc.length); - FreeToHeap(buf); + Heap_Free(buf); } } else { GF_ASSERT(FALSE); @@ -97,41 +97,41 @@ static void ReadMsgData_ExistingTable_ExistingString(struct MsgDataTable *table, } } -static struct String *ReadMsgData_ExistingTable_NewString(struct MsgDataTable *table, u32 num, HeapID heapId) { +static struct String *ReadMsgData_ExistingTable_NewString(struct MsgDataTable *table, u32 num, enum HeapID heapID) { struct MsgDataAlloc alloc; u16 *buf; struct String *dest; if (num < table->count) { alloc = table->alloc[num]; Decrypt1(&alloc, num, table->key); - buf = AllocFromHeapAtEnd(heapId, 2 * alloc.length); + buf = Heap_AllocAtEnd(heapID, 2 * alloc.length); if (buf != NULL) { MI_CpuCopy16((char *)table + alloc.offset, buf, 2 * alloc.length); Decrypt2(buf, alloc.length, num); - dest = String_New(alloc.length, heapId); + dest = String_New(alloc.length, heapID); if (dest != NULL) { CopyU16ArrayToStringN(dest, buf, alloc.length); } - FreeToHeap(buf); + Heap_Free(buf); return dest; } else { return NULL; } } else { GF_ASSERT(FALSE); - return String_New(4, heapId); + return String_New(4, heapID); } } -void ReadMsgData_NewNarc_ExistingString(NarcId narc_id, u32 group, u32 num, HeapID heapId, struct String *dest) { - NARC *narc = NARC_New(narc_id, heapId); +void ReadMsgData_NewNarc_ExistingString(NarcId narc_id, u32 group, u32 num, enum HeapID heapID, struct String *dest) { + NARC *narc = NARC_New(narc_id, heapID); if (narc != NULL) { - ReadMsgData_ExistingNarc_ExistingString(narc, group, num, heapId, dest); + ReadMsgData_ExistingNarc_ExistingString(narc, group, num, heapID, dest); NARC_Delete(narc); } } -static void ReadMsgData_ExistingNarc_ExistingString(NARC *narc, u32 group, u32 num, HeapID heapId, struct String *dest) { +static void ReadMsgData_ExistingNarc_ExistingString(NARC *narc, u32 group, u32 num, enum HeapID heapID, struct String *dest) { u16 *buf; u32 size; u16 sp10[2]; @@ -142,12 +142,12 @@ static void ReadMsgData_ExistingNarc_ExistingString(NARC *narc, u32 group, u32 n NARC_ReadFromMember(narc, group, 8 * num + 4, 8, &alloc); Decrypt1(&alloc, num, sp10[1]); size = alloc.length * 2; - buf = AllocFromHeapAtEnd(heapId, size); + buf = Heap_AllocAtEnd(heapID, size); if (buf != NULL) { NARC_ReadFromMember(narc, group, alloc.offset, size, buf); Decrypt2(buf, alloc.length, num); CopyU16ArrayToStringN(dest, buf, alloc.length); - FreeToHeap(buf); + Heap_Free(buf); return; } } else { @@ -156,19 +156,19 @@ static void ReadMsgData_ExistingNarc_ExistingString(NARC *narc, u32 group, u32 n } } -struct String *ReadMsgData_NewNarc_NewString(NarcId narc_id, u32 group, u32 num, HeapID heapId) { - NARC *narc = NARC_New(narc_id, heapId); +struct String *ReadMsgData_NewNarc_NewString(NarcId narc_id, u32 group, u32 num, enum HeapID heapID) { + NARC *narc = NARC_New(narc_id, heapID); struct String *string; if (narc != NULL) { - string = ReadMsgData_ExistingNarc_NewString(narc, group, num, heapId); + string = ReadMsgData_ExistingNarc_NewString(narc, group, num, heapID); NARC_Delete(narc); } else { - string = String_New(4, heapId); + string = String_New(4, heapID); } return string; } -static struct String *ReadMsgData_ExistingNarc_NewString(NARC *narc, u32 group, u32 num, HeapID heapId) { +static struct String *ReadMsgData_ExistingNarc_NewString(NARC *narc, u32 group, u32 num, enum HeapID heapID) { struct String *dest; u16 *buf; u32 size; @@ -179,21 +179,21 @@ static struct String *ReadMsgData_ExistingNarc_NewString(NARC *narc, u32 group, if (num < sp10[0]) { NARC_ReadFromMember(narc, group, 8 * num + 4, 8, &alloc); Decrypt1(&alloc, num, sp10[1]); - dest = String_New(alloc.length, heapId); + dest = String_New(alloc.length, heapID); if (dest != NULL) { size = alloc.length * 2; - buf = AllocFromHeapAtEnd(heapId, size); + buf = Heap_AllocAtEnd(heapID, size); if (buf != NULL) { NARC_ReadFromMember(narc, group, alloc.offset, size, buf); Decrypt2(buf, alloc.length, num); CopyU16ArrayToStringN(dest, buf, alloc.length); - FreeToHeap(buf); + Heap_Free(buf); } } return dest; } else { GF_ASSERT(FALSE); - return String_New(4, heapId); + return String_New(4, heapID); } } @@ -207,22 +207,22 @@ static u16 GetMsgCount_TableFromNarc(NarcId narc_id, s32 file_id) { return n[0]; } -struct MsgData *NewMsgDataFromNarc(MsgDataLoadType type, NarcId narc_id, s32 file_id, HeapID heapId) { - struct MsgData *msgData = AllocFromHeapAtEnd(heapId, sizeof(struct MsgData)); +struct MsgData *NewMsgDataFromNarc(MsgDataLoadType type, NarcId narc_id, s32 file_id, enum HeapID heapID) { + struct MsgData *msgData = Heap_AllocAtEnd(heapID, sizeof(struct MsgData)); if (msgData != NULL) { if (type == MSGDATA_LOAD_DIRECT) { - msgData->data.raw = LoadSingleElementFromNarc(narc_id, file_id, heapId); + msgData->data.raw = LoadSingleElementFromNarc(narc_id, file_id, heapID); if (msgData->data.raw == NULL) { - FreeToHeap(msgData); + Heap_Free(msgData); return NULL; } } else { - msgData->data.narc = NARC_New(narc_id, heapId); + msgData->data.narc = NARC_New(narc_id, heapID); } msgData->type = (u16)type; msgData->narc_id = (u16)narc_id; msgData->file_id = (u16)file_id; - msgData->heapId = (u16)heapId; + msgData->heapID = (u16)heapID; } return msgData; } @@ -237,7 +237,7 @@ void DestroyMsgData(struct MsgData *msgData) { NARC_Delete(msgData->data.narc); break; } - FreeToHeap(msgData); + Heap_Free(msgData); } } @@ -247,7 +247,7 @@ void ReadMsgDataIntoString(struct MsgData *msgData, u32 msg_no, struct String *d ReadMsgData_ExistingTable_ExistingString(msgData->data.raw, msg_no, dest); break; case MSGDATA_LOAD_LAZY: - ReadMsgData_ExistingNarc_ExistingString(msgData->data.narc, msgData->file_id, msg_no, (HeapID)msgData->heapId, dest); + ReadMsgData_ExistingNarc_ExistingString(msgData->data.narc, msgData->file_id, msg_no, (enum HeapID)msgData->heapID, dest); break; } } @@ -255,9 +255,9 @@ void ReadMsgDataIntoString(struct MsgData *msgData, u32 msg_no, struct String *d struct String *NewString_ReadMsgData(struct MsgData *msgData, u32 msg_no) { switch (msgData->type) { case MSGDATA_LOAD_DIRECT: - return ReadMsgData_ExistingTable_NewString(msgData->data.raw, msg_no, (HeapID)msgData->heapId); + return ReadMsgData_ExistingTable_NewString(msgData->data.raw, msg_no, (enum HeapID)msgData->heapID); case MSGDATA_LOAD_LAZY: - return ReadMsgData_ExistingNarc_NewString(msgData->data.narc, msgData->file_id, msg_no, (HeapID)msgData->heapId); + return ReadMsgData_ExistingNarc_NewString(msgData->data.narc, msgData->file_id, msg_no, (enum HeapID)msgData->heapID); default: return NULL; } @@ -280,18 +280,18 @@ void ReadMsgDataIntoU16Array(struct MsgData *msgData, u32 msg_no, u16 *dest) { ReadMsgData_ExistingTable_ExistingArray(msgData->data.raw, msg_no, dest); break; case MSGDATA_LOAD_LAZY: - ReadMsgData_NewNarc_ExistingArray((NarcId)msgData->narc_id, msgData->file_id, msg_no, (HeapID)msgData->heapId, dest); + ReadMsgData_NewNarc_ExistingArray((NarcId)msgData->narc_id, msgData->file_id, msg_no, (enum HeapID)msgData->heapID, dest); break; } } -void GetSpeciesNameIntoArray(u16 species, HeapID heapId, u16 *dest) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0362_bin, heapId); +void GetSpeciesNameIntoArray(u16 species, enum HeapID heapID, u16 *dest) { + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0362_bin, heapID); ReadMsgDataIntoU16Array(msgData, species, dest); DestroyMsgData(msgData); } -struct String *ReadMsgData_ExpandPlaceholders(MessageFormat *messageFormat, struct MsgData *msgData, u32 msgno, HeapID heapId) { +struct String *ReadMsgData_ExpandPlaceholders(MessageFormat *messageFormat, struct MsgData *msgData, u32 msgno, enum HeapID heapID) { struct String *ret = NULL; struct String *r4 = String_New(1024, HEAP_ID_DEFAULT); struct String *r5; @@ -299,7 +299,7 @@ struct String *ReadMsgData_ExpandPlaceholders(MessageFormat *messageFormat, stru r5 = NewString_ReadMsgData(msgData, msgno); if (r5 != NULL) { StringExpandPlaceholders(messageFormat, r4, r5); - ret = StringDup(r4, heapId); + ret = StringDup(r4, heapID); String_Delete(r5); } String_Delete(r4); @@ -307,11 +307,11 @@ struct String *ReadMsgData_ExpandPlaceholders(MessageFormat *messageFormat, stru return ret; } -struct String *GetMoveName(u32 move, HeapID heapId) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0588_bin, heapId); +struct String *GetMoveName(u32 move, enum HeapID heapID) { + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0588_bin, heapID); struct String *ret; if (msgData != NULL) { - ret = String_New(16, heapId); + ret = String_New(16, heapID); if (ret != NULL) { ReadMsgDataIntoString(msgData, move, ret); } @@ -321,9 +321,9 @@ struct String *GetMoveName(u32 move, HeapID heapId) { return NULL; } -struct String *GetSpeciesName(u16 species, HeapID heapId) { +struct String *GetSpeciesName(u16 species, enum HeapID heapID) { struct String *ret; - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0362_bin, heapId); + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0362_bin, heapID); if (msgData != NULL) { ret = NewString_ReadMsgData(msgData, species); DestroyMsgData(msgData); diff --git a/arm9/src/nutdata.c b/arm9/src/nutdata.c index ea0d56663..ae34c9559 100644 --- a/arm9/src/nutdata.c +++ b/arm9/src/nutdata.c @@ -11,24 +11,24 @@ #include "filesystem.h" #include "msgdata.h" -NARC *OpenNutsDataNarc(HeapID heapId) { - return NARC_New(NARC_ITEMTOOL_ITEMDATA_NUTS_DATA, heapId); +NARC *OpenNutsDataNarc(enum HeapID heapID) { + return NARC_New(NARC_ITEMTOOL_ITEMDATA_NUTS_DATA, heapID); } -struct NutData *ReadNutDataFromNarc(NARC *narc, u32 berry_idx, HeapID heapId) { - return NARC_AllocAndReadWholeMember(narc, berry_idx, heapId); +struct NutData *ReadNutDataFromNarc(NARC *narc, u32 berry_idx, enum HeapID heapID) { + return NARC_AllocAndReadWholeMember(narc, berry_idx, heapID); } void CloseNutsDataNarc(NARC *narc) { NARC_Delete(narc); } -struct NutData *LoadNutDataSingle(s32 berry_idx, HeapID heapId) { - return AllocAndReadWholeNarcMemberByIdPair(NARC_ITEMTOOL_ITEMDATA_NUTS_DATA, berry_idx, heapId); +struct NutData *LoadNutDataSingle(s32 berry_idx, enum HeapID heapID) { + return AllocAndReadWholeNarcMemberByIdPair(NARC_ITEMTOOL_ITEMDATA_NUTS_DATA, berry_idx, heapID); } -struct NutData *LoadNutDataSingleByItemId(s32 item_id, HeapID heapId) { - return LoadNutDataSingle(item_id - FIRST_BERRY_IDX, heapId); +struct NutData *LoadNutDataSingleByItemId(s32 item_id, enum HeapID heapID) { + return LoadNutDataSingle(item_id - FIRST_BERRY_IDX, heapID); } u32 GetNutAttr(struct NutData *nut, u32 attr) { @@ -60,15 +60,15 @@ u32 GetNutAttr(struct NutData *nut, u32 attr) { } } -struct String *GetNutName(u32 berry_idx, HeapID heapId) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0373_bin, heapId); +struct String *GetNutName(u32 berry_idx, enum HeapID heapID) { + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0373_bin, heapID); struct String *ret = NewString_ReadMsgData(msgData, berry_idx); DestroyMsgData(msgData); return ret; } -struct String *GetNutDesc(u32 berry_idx, HeapID heapId) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0372_bin, heapId); +struct String *GetNutDesc(u32 berry_idx, enum HeapID heapID) { + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0372_bin, heapID); struct String *ret = NewString_ReadMsgData(msgData, berry_idx); DestroyMsgData(msgData); return ret; diff --git a/arm9/src/oam.c b/arm9/src/oam.c index cfdc3a572..85f14f4af 100644 --- a/arm9/src/oam.c +++ b/arm9/src/oam.c @@ -14,8 +14,8 @@ extern void sub_0202135C(void *param0, void (*param4)(void), u32 param5, u32 param6); -extern void sub_020203CC(HeapID heapId); -extern void sub_02020404(HeapID heapId); +extern void sub_020203CC(enum HeapID heapID); +extern void sub_02020404(enum HeapID heapID); struct OamData *oamData; @@ -27,7 +27,7 @@ void sub_02009EAC(s32 param0, u32 param5, u32 param6, u32 param7, - HeapID heapId) { + enum HeapID heapID) { s32 r0; if (param0 < 4) { r0 = 4; @@ -48,7 +48,7 @@ void sub_02009EAC(s32 param0, r2 = param2; } - InitOamData(r0, param1, r2, param3, param4, param5, param6, param7, heapId); + InitOamData(r0, param1, r2, param3, param4, param5, param6, param7, heapID); } void InitOamData(s32 param0, @@ -59,12 +59,12 @@ void InitOamData(s32 param0, u32 param5, u32 param6, u32 param7, - HeapID heapId) { + enum HeapID heapID) { GF_ASSERT(oamData == NULL); - oamData = AllocFromHeap(heapId, sizeof(struct OamData)); + oamData = Heap_Alloc(heapID, sizeof(struct OamData)); GF_ASSERT(oamData); - oamData->heapId = heapId; + oamData->heapID = heapID; GF_ASSERT(NNS_G2dGetNewOamManagerInstance( &oamData->oamManagers[0], (u16)param0, (u16)param1, (u16)param2, (u16)param3, 0)); @@ -82,10 +82,10 @@ void ApplyAndResetOamManagerBuffer(void) { void DeinitOamData(void) { GF_ASSERT(oamData); - sub_0200A064(oamData->heapId); - sub_0200A06C(oamData->heapId); + sub_0200A064(oamData->heapID); + sub_0200A06C(oamData->heapID); - FreeToHeap(oamData); + Heap_Free(oamData); oamData = NULL; } @@ -109,12 +109,12 @@ NNSG2dOamManager *GetOamManager(u32 screen) { } } -void sub_0200A064(HeapID heapId) { - sub_020203CC(heapId); +void sub_0200A064(enum HeapID heapID) { + sub_020203CC(heapID); } -void sub_0200A06C(HeapID heapId) { - sub_02020404(heapId); +void sub_0200A06C(enum HeapID heapID) { + sub_02020404(heapID); } u32 EntryOamManagerOamWithAffineIdxMainScreen(u32 param0, u32 param1) { diff --git a/arm9/src/options.c b/arm9/src/options.c index 958e3fe67..2a9ba0011 100644 --- a/arm9/src/options.c +++ b/arm9/src/options.c @@ -7,8 +7,8 @@ #include "main.h" #include "player_data.h" -struct Options *Options_New(HeapID heapId) { - struct Options *ret = AllocFromHeap(heapId, sizeof(struct Options)); +struct Options *Options_New(enum HeapID heapID) { + struct Options *ret = Heap_Alloc(heapID, sizeof(struct Options)); Options_Init(ret); return ret; } diff --git a/arm9/src/overlay_manager.c b/arm9/src/overlay_manager.c index f52feec3b..327bdfc66 100644 --- a/arm9/src/overlay_manager.c +++ b/arm9/src/overlay_manager.c @@ -6,8 +6,8 @@ #include "main.h" #include "poke_overlay.h" -struct OverlayManager *OverlayManager_New(const struct OverlayManagerTemplate *template, s32 *a1, HeapID heapId) { - struct OverlayManager *ret = (struct OverlayManager *)AllocFromHeap(heapId, sizeof(struct OverlayManager)); +struct OverlayManager *OverlayManager_New(const struct OverlayManagerTemplate *template, s32 *a1, enum HeapID heapID) { + struct OverlayManager *ret = (struct OverlayManager *)Heap_Alloc(heapID, sizeof(struct OverlayManager)); ret->template = *template; ret->managerStatus = 0; ret->overlayStatus = 0; @@ -19,11 +19,11 @@ struct OverlayManager *OverlayManager_New(const struct OverlayManagerTemplate *t } void OverlayManager_Delete(struct OverlayManager *overlayManager) { - FreeToHeap(overlayManager); + Heap_Free(overlayManager); } -void *OverlayManager_CreateAndGetData(struct OverlayManager *overlayManager, u32 size, HeapID heapId) { - return overlayManager->data = AllocFromHeap(heapId, size); +void *OverlayManager_CreateAndGetData(struct OverlayManager *overlayManager, u32 size, enum HeapID heapID) { + return overlayManager->data = Heap_Alloc(heapID, size); } void *OverlayManager_GetData(struct OverlayManager *overlayManager) { @@ -31,7 +31,7 @@ void *OverlayManager_GetData(struct OverlayManager *overlayManager) { } void OverlayManager_FreeData(struct OverlayManager *overlayManager) { - FreeToHeap(overlayManager->data); + Heap_Free(overlayManager->data); overlayManager->data = NULL; } diff --git a/arm9/src/palette.c b/arm9/src/palette.c index 511f655e5..0c9508635 100644 --- a/arm9/src/palette.c +++ b/arm9/src/palette.c @@ -8,15 +8,15 @@ #include "unk_0200CA44.h" #include "unk_020222E8.h" -struct PaletteData *sub_02002FD0(HeapID heapId) { - struct PaletteData *ptr = AllocFromHeap(heapId, sizeof(struct PaletteData)); +struct PaletteData *sub_02002FD0(enum HeapID heapID) { + struct PaletteData *ptr = Heap_Alloc(heapID, sizeof(struct PaletteData)); MI_CpuFill8(ptr, 0, sizeof(struct PaletteData)); return ptr; } void sub_02002FEC(struct PaletteData *ptr) { - FreeToHeap(ptr); + Heap_Free(ptr); } void PaletteData_SetBuffers( @@ -27,16 +27,16 @@ void PaletteData_SetBuffers( } void PaletteData_AllocBuffers( - struct PaletteData *paletteData, u32 index, u32 size, HeapID heapId) { - void *ptr = AllocFromHeap(heapId, size); - void *ptr2 = AllocFromHeap(heapId, size); + struct PaletteData *paletteData, u32 index, u32 size, enum HeapID heapID) { + void *ptr = Heap_Alloc(heapID, size); + void *ptr2 = Heap_Alloc(heapID, size); PaletteData_SetBuffers(paletteData, index, ptr, ptr2, size); } void PaletteData_FreeBuffers(struct PaletteData *paletteData, u32 index) { - FreeToHeap(paletteData->pltt[index].unfadedBuf); - FreeToHeap(paletteData->pltt[index].fadedBuf); + Heap_Free(paletteData->pltt[index].unfadedBuf); + Heap_Free(paletteData->pltt[index].fadedBuf); } void PaletteData_LoadPalette( @@ -48,13 +48,13 @@ void PaletteData_LoadPalette( void PaletteData_LoadFromNarc(struct PaletteData *paletteData, NarcId narcId, s32 memberId, - HeapID heapId, + enum HeapID heapID, u32 index, u32 size, u16 offset, u16 param7) { NNSG2dPaletteData *pltData; - void *ptr = GfGfxLoader_GetPlttData(narcId, memberId, &pltData, heapId); + void *ptr = GfGfxLoader_GetPlttData(narcId, memberId, &pltData, heapID); GF_ASSERT(ptr != NULL); @@ -65,17 +65,17 @@ void PaletteData_LoadFromNarc(struct PaletteData *paletteData, GF_ASSERT(size + offset * 2 <= paletteData->pltt[index].bufSize); PaletteData_LoadPalette(paletteData, pltData->pRawData + param7 * 2, index, offset, (u16)size); - FreeToHeap(ptr); + Heap_Free(ptr); } void PaletteData_LoadNarc(struct PaletteData *paletteData, NarcId narcId, s32 memberId, - HeapID heapId, + enum HeapID heapID, u32 index, u32 size, u16 offset) { - PaletteData_LoadFromNarc(paletteData, narcId, memberId, heapId, index, size, offset, 0); + PaletteData_LoadFromNarc(paletteData, narcId, memberId, heapID, index, size, offset, 0); } void sub_02003108(struct PaletteData *paletteData, u32 index, u16 offset, u32 size) { @@ -104,10 +104,10 @@ void sub_02003108(struct PaletteData *paletteData, u32 index, u16 offset, u32 si } void CopyPaletteFromNarc( - NarcId narcId, s32 memberId, HeapID heapId, u32 size, u16 offset, void *dest) { + NarcId narcId, s32 memberId, enum HeapID heapID, u32 size, u16 offset, void *dest) { NNSG2dPaletteData *pltData; - void *ptr = GfGfxLoader_GetPlttData(narcId, memberId, &pltData, heapId); + void *ptr = GfGfxLoader_GetPlttData(narcId, memberId, &pltData, heapID); GF_ASSERT(ptr != NULL); if (size == 0) { @@ -116,7 +116,7 @@ void CopyPaletteFromNarc( MI_CpuCopy16(pltData->pRawData + offset * 2, dest, size); - FreeToHeap(ptr); + Heap_Free(ptr); } void PaletteData_CopyPalette(struct PaletteData *paletteData, @@ -574,7 +574,7 @@ void TintPalette_CustomTone(u16 *palette, s32 count, s32 rTone, s32 gTone, s32 b void sub_02003B40(struct PaletteData *paletteData, NarcId narcId, s32 memberId, - HeapID heapId, + enum HeapID heapID, u32 index, u32 size, u16 offset, @@ -582,7 +582,7 @@ void sub_02003B40(struct PaletteData *paletteData, s32 gTone, s32 bTone) { NNSG2dPaletteData *pltData; - void *ptr = GfGfxLoader_GetPlttData(narcId, memberId, &pltData, heapId); + void *ptr = GfGfxLoader_GetPlttData(narcId, memberId, &pltData, heapID); GF_ASSERT(ptr != NULL); if (size == 0) { @@ -592,5 +592,5 @@ void sub_02003B40(struct PaletteData *paletteData, TintPalette_CustomTone(pltData->pRawData, 0x10, rTone, gTone, bTone); PaletteData_LoadPalette(paletteData, pltData->pRawData, index, offset, (u16)size); - FreeToHeap(ptr); + Heap_Free(ptr); } diff --git a/arm9/src/party.c b/arm9/src/party.c index 556b6b63a..2b2c7ea67 100644 --- a/arm9/src/party.c +++ b/arm9/src/party.c @@ -11,8 +11,8 @@ u32 SaveArray_Party_sizeof(void) { return sizeof(struct Party); } -struct Party *SaveArray_Party_Alloc(HeapID heapId) { - struct Party *ret = (struct Party *)AllocFromHeap(heapId, sizeof(struct Party)); +struct Party *SaveArray_Party_Alloc(enum HeapID heapID) { + struct Party *ret = (struct Party *)Heap_Alloc(heapID, sizeof(struct Party)); SaveArray_Party_Init(ret); return ret; } @@ -87,11 +87,11 @@ BOOL SwapSlotsInParty(struct Party *party, int pos1, int pos2) { GF_ASSERT(pos2 >= 0); GF_ASSERT(pos2 < party->curCount); GF_ASSERT(pos2 < party->maxCount); - buffer = AllocFromHeap(HEAP_ID_DEFAULT, sizeof(struct Pokemon)); + buffer = Heap_Alloc(HEAP_ID_DEFAULT, sizeof(struct Pokemon)); *buffer = party->mons[pos1]; party->mons[pos1] = party->mons[pos2]; party->mons[pos2] = *buffer; - FreeToHeap(buffer); + Heap_Free(buffer); return FALSE; } diff --git a/arm9/src/player_avatar.c b/arm9/src/player_avatar.c index 5c75e8898..3f24e6709 100644 --- a/arm9/src/player_avatar.c +++ b/arm9/src/player_avatar.c @@ -64,7 +64,7 @@ void sub_02055108(PlayerAvatar *avatar) { } void PlayerAvatar_FreeToHeap(PlayerAvatar *avatar) { - FreeToHeap(avatar); + Heap_Free(avatar); } void PlayerAvatar_DeleteFromMap(PlayerAvatar *avatar) { @@ -73,7 +73,7 @@ void PlayerAvatar_DeleteFromMap(PlayerAvatar *avatar) { } static PlayerAvatar *PlayerAvatar_Create(void) { - PlayerAvatar *avatar = AllocFromHeap(HEAP_ID_FIELD, sizeof(PlayerAvatar)); + PlayerAvatar *avatar = Heap_Alloc(HEAP_ID_FIELD, sizeof(PlayerAvatar)); GF_ASSERT(avatar != NULL); memset(avatar, 0, sizeof(PlayerAvatar)); return avatar; diff --git a/arm9/src/player_data.c b/arm9/src/player_data.c index ce1c8cd36..493e751bb 100644 --- a/arm9/src/player_data.c +++ b/arm9/src/player_data.c @@ -43,8 +43,8 @@ u32 PlayerProfile_sizeof(void) { return sizeof(PlayerProfile); } -PlayerProfile *PlayerProfile_New(HeapID heapId) { - PlayerProfile *ret = (PlayerProfile *)AllocFromHeap(heapId, sizeof(PlayerProfile)); +PlayerProfile *PlayerProfile_New(enum HeapID heapID) { + PlayerProfile *ret = (PlayerProfile *)Heap_Alloc(heapID, sizeof(PlayerProfile)); PlayerProfile_Init(ret); return ret; } @@ -75,8 +75,8 @@ void PlayerName_FlatToString(PlayerProfile *data, struct String *str) { CopyU16ArrayToString(str, data->playerName); } -struct String *PlayerProfile_GetPlayerName_NewString(PlayerProfile *data, HeapID heapId) { - struct String *str = String_New(PLAYER_NAME_LENGTH + 1, heapId); +struct String *PlayerProfile_GetPlayerName_NewString(PlayerProfile *data, enum HeapID heapID) { + struct String *str = String_New(PLAYER_NAME_LENGTH + 1, heapID); PlayerName_FlatToString(data, str); return str; } diff --git a/arm9/src/pokedex.c b/arm9/src/pokedex.c index 22871438c..119592a9b 100644 --- a/arm9/src/pokedex.c +++ b/arm9/src/pokedex.c @@ -41,8 +41,8 @@ u32 Save_Pokedex_sizeof(void) { return sizeof(struct Pokedex); } -struct Pokedex *Save_Pokedex_New(HeapID heapId) { - struct Pokedex *ret = (struct Pokedex *)AllocFromHeap(heapId, sizeof(struct Pokedex)); +struct Pokedex *Save_Pokedex_New(enum HeapID heapID) { + struct Pokedex *ret = (struct Pokedex *)Heap_Alloc(heapID, sizeof(struct Pokedex)); Save_Pokedex_Init(ret); return ret; } diff --git a/arm9/src/pokemon.c b/arm9/src/pokemon.c index bf3bfa403..887e30dbe 100644 --- a/arm9/src/pokemon.c +++ b/arm9/src/pokemon.c @@ -45,7 +45,7 @@ BOOL BoxMon_HasPokerus(struct BoxPokemon *boxmon); BOOL BoxMon_IsImmuneToPokerus(struct BoxPokemon *boxmon); void BoxMon_UpdateArceusForm(struct BoxPokemon *boxmon); void LoadLevelUpLearnset_HandleAlternateForm(int species, int form, u16 *levelUpLearnset); -void sub_0206A054(struct BoxPokemon *boxmon, PlayerProfile *a1, u32 pokeball, u32 a3, u32 encounterType, HeapID heapId); +void sub_0206A054(struct BoxPokemon *boxmon, PlayerProfile *a1, u32 pokeball, u32 a3, u32 encounterType, enum HeapID heapID); BOOL MonHasMove(struct Pokemon *pokemon, u16 move); BOOL sub_0206A144(struct BoxPokemon *boxmon, u32 a1); BOOL sub_0206A16C(u16 species, int form, u32 a2); @@ -187,8 +187,8 @@ u32 SizeOfStructPokemon(void) { return sizeof(struct Pokemon); } -struct Pokemon *AllocMonZeroed(HeapID heapId) { - struct Pokemon *pokemon = (struct Pokemon *)AllocFromHeap(heapId, sizeof(struct Pokemon)); +struct Pokemon *AllocMonZeroed(enum HeapID heapID) { + struct Pokemon *pokemon = (struct Pokemon *)Heap_Alloc(heapID, sizeof(struct Pokemon)); ZeroMonData(pokemon); return pokemon; } @@ -254,7 +254,7 @@ void CreateMon(struct Pokemon *pokemon, int species, int level, int fixedIV, int SetMonData(pokemon, MON_DATA_LEVEL, &level); mail = Mail_New(HEAP_ID_DEFAULT); SetMonData(pokemon, MON_DATA_MAIL, mail); - FreeToHeap(mail); + Heap_Free(mail); capsule = 0; SetMonData(pokemon, MON_DATA_BALL_CAPSULE_ID, &capsule); MI_CpuClearFast(seal_coords, sizeof(seal_coords)); @@ -432,7 +432,7 @@ void CalcMonStats(struct Pokemon *pokemon) { form = (int)GetMonData(pokemon, MON_DATA_FORM, NULL); species = (int)GetMonData(pokemon, MON_DATA_SPECIES, NULL); - baseStats = (struct BaseStats *)AllocFromHeap(HEAP_ID_DEFAULT, sizeof(struct BaseStats)); + baseStats = (struct BaseStats *)Heap_Alloc(HEAP_ID_DEFAULT, sizeof(struct BaseStats)); LoadMonBaseStats_HandleAlternateForm(species, form, baseStats); if (species == SPECIES_SHEDINJA) { @@ -462,7 +462,7 @@ void CalcMonStats(struct Pokemon *pokemon) { newSpdef = ModifyStatByNature(GetMonNature(pokemon), (u16)newSpdef, 5); SetMonData(pokemon, MON_DATA_SP_DEF, &newSpdef); - FreeToHeap(baseStats); + Heap_Free(baseStats); if (hp != 0 || maxHp == 0) { if (species == SPECIES_SHEDINJA) { @@ -1718,8 +1718,8 @@ void AddBoxMonData(struct BoxPokemon *boxmon, int attr, int value) { } } -struct BaseStats *AllocAndLoadMonPersonal(int species, HeapID heapId) { - struct BaseStats *baseStats = (struct BaseStats *)AllocFromHeap(heapId, sizeof(struct BaseStats)); +struct BaseStats *AllocAndLoadMonPersonal(int species, enum HeapID heapID) { + struct BaseStats *baseStats = (struct BaseStats *)Heap_Alloc(heapID, sizeof(struct BaseStats)); LoadMonPersonal(species, baseStats); return baseStats; } @@ -1833,7 +1833,7 @@ int GetPersonalAttr(struct BaseStats *baseStats, enum BaseStat attr) { void FreeMonPersonal(struct BaseStats *personal) { GF_ASSERT(personal != NULL); - FreeToHeap(personal); + Heap_Free(personal); } int GetMonBaseStat_HandleFormConversion(int species, int form, enum BaseStat attr) { @@ -1895,10 +1895,10 @@ u32 GetExpByGrowthRateAndLevel(int growthRate, int level) { u32 ret; GF_ASSERT(growthRate < 8); GF_ASSERT(level <= 101); - table = (u32 *)AllocFromHeap(HEAP_ID_DEFAULT, 101 * sizeof(u32)); + table = (u32 *)Heap_Alloc(HEAP_ID_DEFAULT, 101 * sizeof(u32)); LoadGrowthTable(growthRate, table); ret = table[level]; - FreeToHeap(table); + Heap_Free(table); return ret; } @@ -2441,7 +2441,7 @@ u16 GetMonEvolution(struct Party *party, struct Pokemon *pokemon, u32 context, u if (method_ret == NULL) { method_ret = &sp40; } - evoTable = AllocFromHeap(HEAP_ID_DEFAULT, 7 * sizeof(struct Evolution)); + evoTable = Heap_Alloc(HEAP_ID_DEFAULT, 7 * sizeof(struct Evolution)); LoadMonEvolutionTable(species, evoTable); switch (context) { case 0: @@ -2630,7 +2630,7 @@ u16 GetMonEvolution(struct Party *party, struct Pokemon *pokemon, u32 context, u } break; } - FreeToHeap(evoTable); + Heap_Free(evoTable); return target; } @@ -2673,7 +2673,7 @@ void InitBoxMonMoveset(struct BoxPokemon *boxmon) { u32 form; u8 level; u16 move; - levelUpLearnset = AllocFromHeap(HEAP_ID_DEFAULT, MAX_LEARNED_MOVES * sizeof(u16)); + levelUpLearnset = Heap_Alloc(HEAP_ID_DEFAULT, MAX_LEARNED_MOVES * sizeof(u16)); decry = AcquireBoxMonLock(boxmon); species = (u16)GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL); form = GetBoxMonData(boxmon, MON_DATA_FORM, NULL); @@ -2688,7 +2688,7 @@ void InitBoxMonMoveset(struct BoxPokemon *boxmon) { sub_02069718(boxmon, move); } } - FreeToHeap(levelUpLearnset); + Heap_Free(levelUpLearnset); ReleaseBoxMonLock(boxmon, decry); } @@ -2763,20 +2763,20 @@ void BoxMonSetMoveInSlot(struct BoxPokemon *boxmon, u16 move, u8 slot) { u32 sub_02069818(struct Pokemon *pokemon, u32 *r5, u16 *sp0) { u32 ret = 0; - u16 *levelUpLearnset = AllocFromHeap(HEAP_ID_DEFAULT, MAX_LEARNED_MOVES * sizeof(u16)); + u16 *levelUpLearnset = Heap_Alloc(HEAP_ID_DEFAULT, MAX_LEARNED_MOVES * sizeof(u16)); u16 species = (u16)GetMonData(pokemon, MON_DATA_SPECIES, NULL); u32 form = GetMonData(pokemon, MON_DATA_FORM, NULL); u8 level = (u8)GetMonData(pokemon, MON_DATA_LEVEL, NULL); LoadLevelUpLearnset_HandleAlternateForm(species, (int)form, levelUpLearnset); if (levelUpLearnset[*r5] == 0xFFFF) { - FreeToHeap(levelUpLearnset); + Heap_Free(levelUpLearnset); return 0; } while ((levelUpLearnset[*r5] & LEVEL_UP_LEARNSET_LEVEL_MASK) != (level << LEVEL_UP_LEARNSET_LEVEL_SHIFT)) { (*r5)++; if (levelUpLearnset[*r5] == 0xFFFF) { - FreeToHeap(levelUpLearnset); + Heap_Free(levelUpLearnset); return 0; } } @@ -2785,7 +2785,7 @@ u32 sub_02069818(struct Pokemon *pokemon, u32 *r5, u16 *sp0) { (*r5)++; ret = sub_02069698(pokemon, *sp0); } - FreeToHeap(levelUpLearnset); + Heap_Free(levelUpLearnset); return ret; } @@ -2860,7 +2860,7 @@ void CopyBoxPokemonToPokemon(struct BoxPokemon *src, struct Pokemon *dest) { SetMonData(dest, MON_DATA_MAX_HP, &sp0); mail = Mail_New(HEAP_ID_DEFAULT); SetMonData(dest, MON_DATA_MAIL, mail); - FreeToHeap(mail); + Heap_Free(mail); SetMonData(dest, MON_DATA_BALL_CAPSULE_ID, &sp0); MI_CpuClearFast(&sp4, sizeof(sp4)); SetMonData(dest, MON_DATA_BALL_CAPSULE, &sp4); @@ -2926,12 +2926,12 @@ s8 GetFlavorPreferenceFromPID(u32 personality, int flavor) { int Species_LoadLearnsetTable(u16 species, u32 form, u16 *dest) { int i; - u16 *levelUpLearnset = AllocFromHeap(HEAP_ID_DEFAULT, MAX_LEARNED_MOVES * sizeof(u16)); + u16 *levelUpLearnset = Heap_Alloc(HEAP_ID_DEFAULT, MAX_LEARNED_MOVES * sizeof(u16)); LoadLevelUpLearnset_HandleAlternateForm(species, (int)form, levelUpLearnset); for (i = 0; levelUpLearnset[i] != LEVEL_UP_LEARNSET_END; i++) { dest[i] = LEVEL_UP_LEARNSET_MOVE(levelUpLearnset[i]); } - FreeToHeap(levelUpLearnset); + Heap_Free(levelUpLearnset); return i; } @@ -3124,11 +3124,11 @@ void LoadLevelUpLearnset_HandleAlternateForm(int species, int form, u16 *levelUp ReadWholeNarcMemberByIdPair(levelUpLearnset, NARC_POKETOOL_PERSONAL_WOTBL, ResolveMonForm(species, form)); } -void sub_02069FB0(struct SaveChatotSoundClip *r7, u32 r5, u16 r4, s32 r6, s32 sp18, u32 sp1C, HeapID heapId) { +void sub_02069FB0(struct SaveChatotSoundClip *r7, u32 r5, u16 r4, s32 r6, s32 sp18, u32 sp1C, enum HeapID heapID) { if (r4 == SPECIES_CHATOT) { if (!sub_02005F14((int)r5)) { sub_02005E80(1); - sub_020056AC(r5, r4, r6, sp18, heapId); + sub_020056AC(r5, r4, r6, sp18, heapID); } else { if (sp1C) { sub_02005E80(1); @@ -3136,13 +3136,13 @@ void sub_02069FB0(struct SaveChatotSoundClip *r7, u32 r5, u16 r4, s32 r6, s32 sp sub_02005E90(r7, 0, sp18, r6); } } else { - sub_020056AC(r5, r4, r6, sp18, heapId); + sub_020056AC(r5, r4, r6, sp18, heapID); } } -void sub_0206A014(struct Pokemon *pokemon, PlayerProfile *a1, u32 pokeball, u32 a3, u32 encounterType, HeapID heapId) { +void sub_0206A014(struct Pokemon *pokemon, PlayerProfile *a1, u32 pokeball, u32 a3, u32 encounterType, enum HeapID heapID) { u32 hp; - sub_0206A054(&pokemon->box, a1, pokeball, a3, encounterType, heapId); + sub_0206A054(&pokemon->box, a1, pokeball, a3, encounterType, heapID); if (pokeball == ITEM_HEAL_BALL) { hp = GetMonData(pokemon, MON_DATA_MAX_HP, NULL); SetMonData(pokemon, MON_DATA_HP, &hp); @@ -3151,8 +3151,8 @@ void sub_0206A014(struct Pokemon *pokemon, PlayerProfile *a1, u32 pokeball, u32 } } -void sub_0206A054(struct BoxPokemon *boxmon, PlayerProfile *a1, u32 pokeball, u32 a3, u32 encounterType, HeapID heapId) { - sub_020808AC(boxmon, a1, 0, a3, heapId); +void sub_0206A054(struct BoxPokemon *boxmon, PlayerProfile *a1, u32 pokeball, u32 a3, u32 encounterType, enum HeapID heapID) { + sub_020808AC(boxmon, a1, 0, a3, heapID); SetBoxMonData(boxmon, MON_DATA_MET_GAME, (void *)&gGameVersion); SetBoxMonData(boxmon, MON_DATA_POKEBALL, &pokeball); SetBoxMonData(boxmon, MON_DATA_MET_TERRAIN, &encounterType); @@ -3272,7 +3272,7 @@ void sub_0206A23C(struct Pokemon *r5, u32 personality) { r5->box.checksum = CHECKSUM(&r5->box); ENCRYPT_BOX(&r5->box); ENCRYPT_PTY(r5); - FreeToHeap(sp4); + Heap_Free(sp4); } void LoadMonPersonal(int species, struct BaseStats *personal) { @@ -3458,13 +3458,13 @@ BOOL sub_0206A998(struct Pokemon *pokemon) { return IsPokemonLegendaryOrMythical(species); } -BOOL sub_0206A9AC(struct BoxPokemon *boxmon, PlayerProfile *sb2, HeapID heapId) { +BOOL sub_0206A9AC(struct BoxPokemon *boxmon, PlayerProfile *sb2, enum HeapID heapID) { u32 myId = PlayerProfile_GetTrainerID(sb2); u32 otId = GetBoxMonData(boxmon, MON_DATA_OT_ID, NULL); u32 myGender = PlayerProfile_GetTrainerGender(sb2); u32 otGender = GetBoxMonData(boxmon, MON_DATA_OT_GENDER, NULL); - struct String *r7 = PlayerProfile_GetPlayerName_NewString(sb2, heapId); - struct String *r6 = String_New(PLAYER_NAME_LENGTH + 1, heapId); + struct String *r7 = PlayerProfile_GetPlayerName_NewString(sb2, heapID); + struct String *r6 = String_New(PLAYER_NAME_LENGTH + 1, heapID); BOOL ret = FALSE; GetBoxMonData(boxmon, MON_DATA_OT_NAME_STRING, r6); if (myId == otId && myGender == otGender && String_Compare(r7, r6) == 0) { diff --git a/arm9/src/render_window.c b/arm9/src/render_window.c index d17d7af4e..8260cd3a2 100644 --- a/arm9/src/render_window.c +++ b/arm9/src/render_window.c @@ -35,7 +35,7 @@ extern void sub_0201FDEC(u32 param0); extern void ov05_021D99F8(struct UnkStruct_0200CABC_2 *param0); extern void *sub_0201B6C8(SysTask *sysTask); extern void ov05_021D959C( - struct UnkStruct_0200CABC_2 *param0, void *param1, u32 param2, HeapID heapId); + struct UnkStruct_0200CABC_2 *param0, void *param1, u32 param2, enum HeapID heapID); extern void ov05_021D967C(struct UnkStruct_0200CABC_2 *param0, NarcId narcId, s32 memberId, @@ -57,7 +57,7 @@ extern u32 NNS_G2dGetImageLocation(u32, u32); extern void *sub_02012470(u16, u16, u16); extern u32 NNS_G2dGetImagePaletteLocation(u32, u32); -u32 sub_0200CABC(struct BgConfig *bgConfig, u32 layer, u32 numTiles, u32 param3, HeapID heapId) { +u32 sub_0200CABC(struct BgConfig *bgConfig, u32 layer, u32 numTiles, u32 param3, enum HeapID heapID) { if (param3 == 0) { return GfGfxLoader_LoadCharData(NARC_GRAPHIC_WINFRAME, NARC_winframe_narc_0000_NCGR, @@ -66,7 +66,7 @@ u32 sub_0200CABC(struct BgConfig *bgConfig, u32 layer, u32 numTiles, u32 param3, numTiles, 0, FALSE, - heapId); + heapID); } return GfGfxLoader_LoadCharData(NARC_GRAPHIC_WINFRAME, @@ -76,14 +76,14 @@ u32 sub_0200CABC(struct BgConfig *bgConfig, u32 layer, u32 numTiles, u32 param3, numTiles, 0, FALSE, - heapId); + heapID); } s32 sub_0200CAFC(void) { return NARC_winframe_narc_0024_NCLR; } -void LoadUserFrameGfx1(struct BgConfig *bg_config, enum GFBgLayer layer, u32 num_tiles, u32 paletteNumber, u8 frame_id, HeapID heapId) { +void LoadUserFrameGfx1(struct BgConfig *bg_config, enum GFBgLayer layer, u32 num_tiles, u32 paletteNumber, u8 frame_id, enum HeapID heapID) { s32 r1; if (frame_id != 0) { r1 = NARC_winframe_narc_0001_NCGR; @@ -91,7 +91,7 @@ void LoadUserFrameGfx1(struct BgConfig *bg_config, enum GFBgLayer layer, u32 num r1 = NARC_winframe_narc_0000_NCGR; } - GfGfxLoader_LoadCharData(NARC_GRAPHIC_WINFRAME, r1, bg_config, layer, num_tiles, 0, FALSE, heapId); + GfGfxLoader_LoadCharData(NARC_GRAPHIC_WINFRAME, r1, bg_config, layer, num_tiles, 0, FALSE, heapID); if (frame_id == 2) { r1 = NARC_winframe_narc_0045_NCLR; @@ -100,11 +100,11 @@ void LoadUserFrameGfx1(struct BgConfig *bg_config, enum GFBgLayer layer, u32 num } if ((u32)layer < GF_BG_LYR_SUB_FIRST) { - GfGfxLoader_GXLoadPal(NARC_GRAPHIC_WINFRAME, r1, GF_PAL_LOCATION_MAIN_BG, (enum GFPalSlotOffset)(paletteNumber << 5), 32, heapId); + GfGfxLoader_GXLoadPal(NARC_GRAPHIC_WINFRAME, r1, GF_PAL_LOCATION_MAIN_BG, (enum GFPalSlotOffset)(paletteNumber << 5), 32, heapID); return; } - GfGfxLoader_GXLoadPal(NARC_GRAPHIC_WINFRAME, r1, GF_PAL_LOCATION_SUB_BG, (enum GFPalSlotOffset)(paletteNumber << 5), 32, heapId); + GfGfxLoader_GXLoadPal(NARC_GRAPHIC_WINFRAME, r1, GF_PAL_LOCATION_SUB_BG, (enum GFPalSlotOffset)(paletteNumber << 5), 32, heapID); } void DrawFrame1(struct BgConfig *bgConfig, @@ -170,17 +170,17 @@ s32 sub_0200CD64(s32 param0) { return param0 + 25; } -void sub_0200CD68(struct BgConfig *bg_config, u32 layer, u32 num_tiles, u32 palNumber, u8 frame_id, HeapID heapId) { +void sub_0200CD68(struct BgConfig *bg_config, u32 layer, u32 num_tiles, u32 palNumber, u8 frame_id, enum HeapID heapID) { GfGfxLoader_LoadCharData( - NARC_GRAPHIC_WINFRAME, sub_0200CD60(frame_id), bg_config, layer, num_tiles, 0, FALSE, heapId); + NARC_GRAPHIC_WINFRAME, sub_0200CD60(frame_id), bg_config, layer, num_tiles, 0, FALSE, heapID); if (layer < GF_BG_LYR_SUB_FIRST) { - GfGfxLoader_GXLoadPal(NARC_GRAPHIC_WINFRAME, sub_0200CD64(frame_id), GF_PAL_LOCATION_MAIN_BG, (enum GFPalSlotOffset)(palNumber << 5), 32, heapId); + GfGfxLoader_GXLoadPal(NARC_GRAPHIC_WINFRAME, sub_0200CD64(frame_id), GF_PAL_LOCATION_MAIN_BG, (enum GFPalSlotOffset)(palNumber << 5), 32, heapID); return; } - GfGfxLoader_GXLoadPal(NARC_GRAPHIC_WINFRAME, sub_0200CD64(frame_id), GF_PAL_LOCATION_SUB_BG, (enum GFPalSlotOffset)(palNumber << 5), 32, heapId); + GfGfxLoader_GXLoadPal(NARC_GRAPHIC_WINFRAME, sub_0200CD64(frame_id), GF_PAL_LOCATION_SUB_BG, (enum GFPalSlotOffset)(palNumber << 5), 32, heapID); } void DrawFrame2(struct BgConfig *bgConfig, @@ -297,17 +297,17 @@ void BlitRect4Bit(u8 *srcPixels, } void sub_0200D18C(struct Window *window, u16 fill_value) { - HeapID heapId = BgConfig_GetHeapId(window->bgConfig); + enum HeapID heapID = BgConfig_GetHeapId(window->bgConfig); u8 bg_id = GetWindowBgId(window); - void *ptr = AllocFromHeap(heapId, 0x180); + void *ptr = Heap_Alloc(heapID, 0x180); void *charptr = BgGetCharPtr((u8)bg_id); NNSG2dCharacterData *pCharData; void *st30; void *st2c; st2c = GfGfxLoader_GetCharData( - NARC_GRAPHIC_WINFRAME, NARC_winframe_narc_0022_NCGR, FALSE, &pCharData, heapId); + NARC_GRAPHIC_WINFRAME, NARC_winframe_narc_0022_NCGR, FALSE, &pCharData, heapID); st30 = pCharData->pRawData; for (u8 i = 0; i < 3; i++) { @@ -320,17 +320,17 @@ void sub_0200D18C(struct Window *window, u16 fill_value) { BlitRect4Bit(st30, 4, 0, 12, 0x30, ptr, 12, 0x30, 1, 0, 12, 0x30); BG_LoadCharTilesData(window->bgConfig, (u8)bg_id, ptr, 0x180, (u32)(fill_value + 18)); sub_02002840(fill_value); - FreeToHeap(st2c); - FreeToHeap(ptr); + Heap_Free(st2c); + Heap_Free(ptr); } void sub_0200D274( - struct BgConfig *bg_config, u8 bg_id, u16 param2, u8 param3, u8 param4, HeapID heapId) { + struct BgConfig *bg_config, u8 bg_id, u16 param2, u8 param3, u8 param4, enum HeapID heapID) { NNSG2dCharacterData *pCharData; void *stc = GfGfxLoader_GetCharData( - NARC_GRAPHIC_WINFRAME, sub_0200CD60(param4), FALSE, &pCharData, heapId); - u8 *ptr = AllocFromHeap(heapId, 0x240); + NARC_GRAPHIC_WINFRAME, sub_0200CD60(param4), FALSE, &pCharData, heapID); + u8 *ptr = Heap_Alloc(heapID, 0x240); memcpy(ptr, pCharData->pRawData, 0x240); for (u32 r3 = 0; r3 < 0x240; r3++) { @@ -347,34 +347,34 @@ void sub_0200D274( } BG_LoadCharTilesData(bg_config, bg_id, (u32 *)ptr, 0x240, param2); - FreeToHeap(stc); - FreeToHeap(ptr); + Heap_Free(stc); + Heap_Free(ptr); } -void sub_0200D300(struct BgConfig *bg_config, u8 bg_id, u16 numtiles, u8 palIndex, u8 param4, u16 param5, HeapID heapId) { - GfGfxLoader_LoadCharData(NARC_GRAPHIC_FIELD_BOARD, NARC_field_board_narc_0000_NCGR, bg_config, bg_id, numtiles, 0x3C0, FALSE, heapId); +void sub_0200D300(struct BgConfig *bg_config, u8 bg_id, u16 numtiles, u8 palIndex, u8 param4, u16 param5, enum HeapID heapID) { + GfGfxLoader_LoadCharData(NARC_GRAPHIC_FIELD_BOARD, NARC_field_board_narc_0000_NCGR, bg_config, bg_id, numtiles, 0x3C0, FALSE, heapID); NNSG2dPaletteData *pPltData; void *st14; - st14 = AllocAndReadWholeNarcMemberByIdPair(NARC_GRAPHIC_FIELD_BOARD, NARC_field_board_narc_0001_NCLR, heapId); + st14 = AllocAndReadWholeNarcMemberByIdPair(NARC_GRAPHIC_FIELD_BOARD, NARC_field_board_narc_0001_NCLR, heapID); NNS_G2dGetUnpackedPaletteData(st14, &pPltData); BG_LoadPlttData(bg_id, pPltData->pRawData + param4 * 0x20, 0x20, (enum GFPalSlotOffset)(u16)(palIndex << 5)); - FreeToHeapExplicit(heapId, st14); + Heap_FreeExplicit(heapID, st14); if (param4 <= 1) { - sub_0200D378(bg_config, bg_id, (u16)(numtiles + 30), param4, param5, heapId); + sub_0200D378(bg_config, bg_id, (u16)(numtiles + 30), param4, param5, heapID); } } void sub_0200D378( - struct BgConfig *bg_config, u8 bg_id, u16 numtiles, u8 param3, u16 param4, HeapID heapId) { + struct BgConfig *bg_config, u8 bg_id, u16 numtiles, u8 param3, u16 param4, enum HeapID heapID) { if (param3 == 0) { param4 += 33; } else { param4 += 2; } - GfGfxLoader_LoadCharData(NARC_GRAPHIC_FIELD_BOARD, param4, bg_config, bg_id, numtiles, 0x300, FALSE, heapId); + GfGfxLoader_LoadCharData(NARC_GRAPHIC_FIELD_BOARD, param4, bg_config, bg_id, numtiles, 0x300, FALSE, heapID); } void DrawFrame3(struct BgConfig *bgConfig, @@ -525,12 +525,12 @@ void ClearFrameAndWindow3(struct Window *window, u8 param1, BOOL copy_to_vram) { } WaitingIcon *WaitingIcon_New(struct Window *window, u32 param1) { - HeapID heapId = BgConfig_GetHeapId(window->bgConfig); + enum HeapID heapID = BgConfig_GetHeapId(window->bgConfig); void *charptr = BgGetCharPtr(GetWindowBgId(window)); - WaitingIcon *waitingIcon = AllocFromHeap(heapId, sizeof(WaitingIcon)); + WaitingIcon *waitingIcon = Heap_Alloc(heapID, sizeof(WaitingIcon)); memcpy(waitingIcon->unk004[8], charptr + (param1 + 18) * 32, 0x80); - void *ptr2 = AllocFromHeap(heapId, 0x80); + void *ptr2 = Heap_Alloc(heapID, 0x80); memcpy(ptr2, charptr + (param1 + 10) * 32, 0x20); memcpy(ptr2 + 0x20, charptr + (param1 + 11) * 32, 0x20); memcpy(ptr2 + 0x40, charptr + (param1 + 10) * 32, 0x20); @@ -539,12 +539,12 @@ WaitingIcon *WaitingIcon_New(struct Window *window, u32 param1) { for (u8 i = 0; i < 8; i++) { memcpy(waitingIcon->unk004[i], ptr2, 0x80); } - FreeToHeap(ptr2); + Heap_Free(ptr2); NNSG2dCharacterData *pCharData; - void *r5 = GfGfxLoader_GetCharData(NARC_GRAPHIC_WINFRAME, NARC_winframe_narc_0023_NCGR, FALSE, &pCharData, heapId); + void *r5 = GfGfxLoader_GetCharData(NARC_GRAPHIC_WINFRAME, NARC_winframe_narc_0023_NCGR, FALSE, &pCharData, heapID); BlitRect4Bit(pCharData->pRawData, 0, 0, 0x10, 0x80, waitingIcon->unk004[0], 0x10, 0x80, 0, 0, 0x10, 0x80); - FreeToHeap(r5); + Heap_Free(r5); waitingIcon->window = window; waitingIcon->fillValue = (u16)param1; @@ -604,7 +604,7 @@ void sub_0200DB7C(SysTask *sysTask, void *param1) { } void sub_0200DBE8(SysTask *sysTask, void *param1) { - FreeToHeap(param1); + Heap_Free(param1); SysTask_Destroy(sysTask); } @@ -618,10 +618,10 @@ void sub_0200DC24(WaitingIcon *waitingIcon) { waitingIcon->unk488 = 2; } -PokepicManager *DrawPokemonPicFromSpecies(struct BgConfig *bg_config, u8 bg_id, u8 param2, u8 param3, u8 param4, u16 numTiles, u16 species, u8 gender, HeapID heapId) { - s32 heap = heapId; // weirdness needed for matching - struct UnkStruct_0200CABC_2 *r4 = sub_0200DD70(bg_config, bg_id, param2, param3, (HeapID)heap); - sub_0200DDAC(r4, (HeapID)heap); +PokepicManager *DrawPokemonPicFromSpecies(struct BgConfig *bg_config, u8 bg_id, u8 param2, u8 param3, u8 param4, u16 numTiles, u16 species, u8 gender, enum HeapID heapID) { + s32 heap = heapID; // weirdness needed for matching + struct UnkStruct_0200CABC_2 *r4 = sub_0200DD70(bg_config, bg_id, param2, param3, (enum HeapID)heap); + sub_0200DDAC(r4, (enum HeapID)heap); sub_0200DDD8(r4); sub_0200DE30(r4, param2, param3); sub_0200DE80(r4, species, gender); @@ -631,10 +631,10 @@ PokepicManager *DrawPokemonPicFromSpecies(struct BgConfig *bg_config, u8 bg_id, return &r4->pokepicManager; } -PokepicManager *DrawPokemonPicFromMon(struct BgConfig *bg_config, u8 bg_id, u8 param2, u8 param3, u8 param4, u16 numTiles, struct Pokemon *mon, HeapID heapId) { - s32 heap = heapId; // weirdness needed for matching - struct UnkStruct_0200CABC_2 *r4 = sub_0200DD70(bg_config, bg_id, param2, param3, (HeapID)heap); - sub_0200DDAC(r4, (HeapID)heap); +PokepicManager *DrawPokemonPicFromMon(struct BgConfig *bg_config, u8 bg_id, u8 param2, u8 param3, u8 param4, u16 numTiles, struct Pokemon *mon, enum HeapID heapID) { + s32 heap = heapID; // weirdness needed for matching + struct UnkStruct_0200CABC_2 *r4 = sub_0200DD70(bg_config, bg_id, param2, param3, (enum HeapID)heap); + sub_0200DDAC(r4, (enum HeapID)heap); sub_0200DDD8(r4); sub_0200DE30(r4, param2, param3); sub_0200DEC0(r4, mon); @@ -668,8 +668,8 @@ void sub_0200DCF8(SysTask *task, void *param1) { } struct UnkStruct_0200CABC_2 *sub_0200DD70( - struct BgConfig *bg_config, u8 bg_id, u8 param2, u8 param3, HeapID heapId) { - struct UnkStruct_0200CABC_2 *res = sub_0201B6C8(sub_020061E8((SysTaskFunc)sub_0200DCF8, 0x170, 0, heapId)); + struct BgConfig *bg_config, u8 bg_id, u8 param2, u8 param3, enum HeapID heapID) { + struct UnkStruct_0200CABC_2 *res = sub_0201B6C8(sub_020061E8((SysTaskFunc)sub_0200DCF8, 0x170, 0, heapID)); res->pokepicManager.unk00 = 0; res->bgConfig = bg_config; @@ -680,7 +680,7 @@ struct UnkStruct_0200CABC_2 *sub_0200DD70( return res; } -void sub_0200DDAC(struct UnkStruct_0200CABC_2 *param0, HeapID heapId) { +void sub_0200DDAC(struct UnkStruct_0200CABC_2 *param0, enum HeapID heapID) { const u32 UNK_020ECEA8[] = { 0x01, @@ -690,7 +690,7 @@ void sub_0200DDAC(struct UnkStruct_0200CABC_2 *param0, HeapID heapId) { 0x00, 0x00, }; - ov05_021D959C(param0, UNK_020ECEA8, 1, heapId); + ov05_021D959C(param0, UNK_020ECEA8, 1, heapID); } void sub_0200DDD8(struct UnkStruct_0200CABC_2 *param0) { @@ -724,7 +724,7 @@ void sub_0200DE30(struct UnkStruct_0200CABC_2 *param0, u8 param1, u8 param2) { } void sub_0200DE80(struct UnkStruct_0200CABC_2 *param0, u16 param1, u8 param2) { - struct UnkStruct_02006D98 *r7 = sub_02006D98((HeapID)param0->unk162); + struct UnkStruct_02006D98 *r7 = sub_02006D98((enum HeapID)param0->unk162); struct SomeDrawPokemonStruct stc; sub_02068C00(&stc, param1, param2, 2, 0, 0, 0); sub_0200DEF4(param0, &stc); @@ -732,7 +732,7 @@ void sub_0200DE80(struct UnkStruct_0200CABC_2 *param0, u16 param1, u8 param2) { } void sub_0200DEC0(struct UnkStruct_0200CABC_2 *param0, struct Pokemon *param1) { - struct UnkStruct_02006D98 *r6 = sub_02006D98((HeapID)param0->unk162); + struct UnkStruct_02006D98 *r6 = sub_02006D98((enum HeapID)param0->unk162); struct SomeDrawPokemonStruct st0; sub_02068B68(&st0, param1, 2); sub_0200DEF4(param0, &st0); @@ -741,7 +741,7 @@ void sub_0200DEC0(struct UnkStruct_0200CABC_2 *param0, struct Pokemon *param1) { void sub_0200DEF4( struct UnkStruct_0200CABC_2 *param0, struct SomeDrawPokemonStruct *param1) { - void *r4 = AllocFromHeap((HeapID)param0->unk162, 0x1900); + void *r4 = Heap_Alloc((enum HeapID)param0->unk162, 0x1900); struct UnkStruct_0200CABC_3 st18 = UNK_020ECE98; sub_02012400(param1->unk0, param1->unk2, param0->unk162, &st18, r4); @@ -754,13 +754,13 @@ void sub_0200DEF4( u32 r7 = NNS_G2dGetImageLocation(st4, 1); DC_FlushRange(r4, 0x1900); GX_LoadOBJ(r4, r7, 0x1900); - FreeToHeap(r4); + Heap_Free(r4); void *res = sub_02012470(param1->unk0, param1->unk4, param0->unk162); u32 r5 = NNS_G2dGetImagePaletteLocation(sub_02009E54(sub_020094F0(param0->unk134, 0x15CD5), st4), 1); DC_FlushRange(res, 0x20); GX_LoadOBJPltt(res, r5, 0x20); - FreeToHeap(res); + Heap_Free(res); } void DrawFramed10x10Square( diff --git a/arm9/src/sav_chatot.c b/arm9/src/sav_chatot.c index 7ae2e41b1..50abb7abf 100644 --- a/arm9/src/sav_chatot.c +++ b/arm9/src/sav_chatot.c @@ -14,8 +14,8 @@ void Save_Chatot_Init(struct SaveChatotSoundClip *chatot) { chatot->exists = FALSE; } -struct SaveChatotSoundClip *Chatot_New(HeapID heapId) { - struct SaveChatotSoundClip *ret = (struct SaveChatotSoundClip *)AllocFromHeap(heapId, sizeof(struct SaveChatotSoundClip)); +struct SaveChatotSoundClip *Chatot_New(enum HeapID heapID) { + struct SaveChatotSoundClip *ret = (struct SaveChatotSoundClip *)Heap_Alloc(heapID, sizeof(struct SaveChatotSoundClip)); Save_Chatot_Init(ret); return ret; } diff --git a/arm9/src/save.c b/arm9/src/save.c index 3fe96c8e2..c6498bdf4 100644 --- a/arm9/src/save.c +++ b/arm9/src/save.c @@ -19,7 +19,7 @@ static BOOL saveWritten; static SaveData *sSaveDataPtr; struct SaveData *SaveData_New(void) { - struct SaveData *save = AllocFromHeap(HEAP_ID_1, sizeof(struct SaveData)); + struct SaveData *save = Heap_Alloc(HEAP_ID_1, sizeof(struct SaveData)); MI_CpuClearFast(save, sizeof(struct SaveData)); sSaveDataPtr = save; save->flashOkay = SaveDetectFlash(); @@ -65,7 +65,7 @@ void *sub_02022634(struct SaveData *save, int idx) { // Clears bits at 0x021C491 BOOL sub_0202263C(struct SaveData *save) { - u8 *r6 = AllocFromHeapAtEnd(HEAP_ID_MAIN, 0x1000); + u8 *r6 = Heap_AllocAtEnd(HEAP_ID_MAIN, 0x1000); sub_02016444(1); FlashClobberChunkFooter(save, 0, (u32)(save->unk_20220[0] == 0 ? 1 : 0)); FlashClobberChunkFooter(save, 1, (u32)(save->unk_20220[1] == 0 ? 1 : 0)); @@ -76,7 +76,7 @@ BOOL sub_0202263C(struct SaveData *save) { FlashWriteChunk((u32)(0x1000 * i), r6, 0x1000); FlashWriteChunk((u32)(0x1000 * (i + 0x40)), r6, 0x1000); } - FreeToHeap(r6); + Heap_Free(r6); Save_InitDynamicRegion(save); save->saveFileExists = 0; sub_02016454(1); @@ -316,8 +316,8 @@ int sub_02022AD8(struct SaveData *save) { u32 sp8; u32 sp4; { - u8 *r6 = AllocFromHeapAtEnd(HEAP_ID_MAIN, 0x20000); - u8 *r4 = AllocFromHeapAtEnd(HEAP_ID_MAIN, 0x20000); + u8 *r6 = Heap_AllocAtEnd(HEAP_ID_MAIN, 0x20000); + u8 *r4 = Heap_AllocAtEnd(HEAP_ID_MAIN, 0x20000); if (FlashLoadChunk(0, r6, 0x20000)) { sub_0202293C(&sp2C[0], save, r6, 0); sub_0202293C(&sp14[0], save, r6, 1); @@ -332,8 +332,8 @@ int sub_02022AD8(struct SaveData *save) { sub_0202288C(&sp2C[1]); sub_0202288C(&sp14[1]); } - FreeToHeap(r6); - FreeToHeap(r4); + Heap_Free(r6); + Heap_Free(r4); } { int r4, r0; @@ -667,7 +667,7 @@ int WriteSaveFileToFlash(struct SaveData *save, int idx, u8 *data) { return 3; } -u8 *ReadSaveFileFromFlash(struct SaveData *save, HeapID heapId, int idx, int *ret_p) { +u8 *ReadSaveFileFromFlash(struct SaveData *save, enum HeapID heapID, int idx, int *ret_p) { GF_ASSERT(idx < UNK_020EE6D8); const struct SaveChunkHeader *sch = &UNK_020EE6E0[idx]; GF_ASSERT(sch->id == idx); @@ -676,7 +676,7 @@ u8 *ReadSaveFileFromFlash(struct SaveData *save, HeapID heapId, int idx, int *re u32 sp8; int r7; u32 sp4; - u8 *r6 = AllocFromHeap(heapId, sp10); + u8 *r6 = Heap_Alloc(heapID, sp10); FlashLoadChunk((u32)(sch->linkedId << 12), r6, sp10); spC = ValidateChunk(save, r6, idx, sch->sizeFunc()); sp8 = sub_020232B4(r6, sch->sizeFunc()); @@ -748,7 +748,7 @@ BOOL FlashLoadChunk(u32 src, void *dest, u32 size) { CARD_UnlockBackup((u16)lock); OS_ReleaseLockID((u16)lock); if (!r5) { - FreeToHeap(sSaveDataPtr); + Heap_Free(sSaveDataPtr); ShowSaveDataReadError(HEAP_ID_1); } return r5; @@ -797,6 +797,6 @@ BOOL WaitFlashWrite(int lock, BOOL *res) { void SaveErrorHandling(int lock, u32 errno) { CARD_UnlockBackup((u16)lock); OS_ReleaseLockID((u16)lock); - FreeToHeap(sSaveDataPtr); + Heap_Free(sSaveDataPtr); ShowSaveDataWriteError(HEAP_ID_1, errno); } diff --git a/arm9/src/save_data_read_error.c b/arm9/src/save_data_read_error.c index 188b88a0f..25c3b23b9 100644 --- a/arm9/src/save_data_read_error.c +++ b/arm9/src/save_data_read_error.c @@ -64,7 +64,7 @@ static const struct GraphicsBanks sSaveDataReadErrorGraphicsBanks = { .texpltt = GX_VRAM_TEXPLTT_NONE, }; -void ShowSaveDataReadError(HeapID heapId) { +void ShowSaveDataReadError(enum HeapID heapID) { struct Window window; sub_0200E3A0(PM_LCD_TOP, 0); @@ -89,20 +89,20 @@ void ShowSaveDataReadError(HeapID heapId) { GXS_SetVisibleWnd(0); GfGfx_SetBanks(&sSaveDataReadErrorGraphicsBanks); - struct BgConfig *bg_config = BgConfig_Alloc(heapId); + struct BgConfig *bg_config = BgConfig_Alloc(heapID); SetBothScreensModesAndDisable(&sSaveDataReadErrorGraphicsModes); InitBgFromTemplate(bg_config, 0, &sSaveDataReadErrorBgTemplate, 0); BgClearTilemapBufferAndCommit(bg_config, GF_BG_LYR_MAIN_0); - LoadUserFrameGfx1(bg_config, GF_BG_LYR_MAIN_0, 0x01F7, 2, 0, heapId); - LoadFontPal0(GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_1_OFFSET, heapId); - BG_ClearCharDataRange(GF_BG_LYR_MAIN_0, 0x20, 0, heapId); + LoadUserFrameGfx1(bg_config, GF_BG_LYR_MAIN_0, 0x01F7, 2, 0, heapID); + LoadFontPal0(GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_1_OFFSET, heapID); + BG_ClearCharDataRange(GF_BG_LYR_MAIN_0, 0x20, 0, heapID); BG_SetMaskColor(GF_BG_LYR_MAIN_0, RGB(1, 1, 27)); BG_SetMaskColor(GF_BG_LYR_SUB_0, RGB(1, 1, 27)); - struct MsgData *msg_data = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0005_bin, heapId); - struct String *str = String_New(384, heapId); + struct MsgData *msg_data = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0005_bin, heapID); + struct String *str = String_New(384, heapID); ResetAllTextPrinters(); @@ -125,7 +125,7 @@ void ShowSaveDataReadError(HeapID heapId) { } } -void ShowGBACartRemovedError(HeapID heapId) { +void ShowGBACartRemovedError(enum HeapID heapID) { struct Window window; sub_0200E3A0(PM_LCD_TOP, 0); @@ -150,20 +150,20 @@ void ShowGBACartRemovedError(HeapID heapId) { GXS_SetVisibleWnd(0); GfGfx_SetBanks(&sSaveDataReadErrorGraphicsBanks); - struct BgConfig *bg_config = BgConfig_Alloc(heapId); + struct BgConfig *bg_config = BgConfig_Alloc(heapID); SetBothScreensModesAndDisable(&sSaveDataReadErrorGraphicsModes); InitBgFromTemplate(bg_config, 0, &sSaveDataReadErrorBgTemplate, 0); BgClearTilemapBufferAndCommit(bg_config, GF_BG_LYR_MAIN_0); - LoadUserFrameGfx1(bg_config, GF_BG_LYR_MAIN_0, 0x01F7, 2, 0, heapId); - LoadFontPal0(GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_1_OFFSET, heapId); - BG_ClearCharDataRange(GF_BG_LYR_MAIN_0, 0x20, 0, heapId); + LoadUserFrameGfx1(bg_config, GF_BG_LYR_MAIN_0, 0x01F7, 2, 0, heapID); + LoadFontPal0(GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_1_OFFSET, heapID); + BG_ClearCharDataRange(GF_BG_LYR_MAIN_0, 0x20, 0, heapID); BG_SetMaskColor(GF_BG_LYR_MAIN_0, RGB(1, 1, 27)); BG_SetMaskColor(GF_BG_LYR_SUB_0, RGB(1, 1, 27)); - struct MsgData *msg_data = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0005_bin, heapId); - struct String *str = String_New(384, heapId); + struct MsgData *msg_data = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0005_bin, heapID); + struct String *str = String_New(384, heapID); ResetAllTextPrinters(); diff --git a/arm9/src/save_data_write_error.c b/arm9/src/save_data_write_error.c index b9841ed71..bf76ecd88 100644 --- a/arm9/src/save_data_write_error.c +++ b/arm9/src/save_data_write_error.c @@ -64,7 +64,7 @@ static const struct GraphicsBanks sSaveDataWriteErrorGraphicsBanks = { .texpltt = GX_VRAM_TEXPLTT_NONE, }; -void ShowSaveDataWriteError(HeapID heapId, u32 err_no) { +void ShowSaveDataWriteError(enum HeapID heapID, u32 err_no) { struct Window window; u32 msg_no; @@ -97,20 +97,20 @@ void ShowSaveDataWriteError(HeapID heapId, u32 err_no) { GXS_SetVisibleWnd(0); GfGfx_SetBanks(&sSaveDataWriteErrorGraphicsBanks); - struct BgConfig *bg_config = BgConfig_Alloc(heapId); + struct BgConfig *bg_config = BgConfig_Alloc(heapID); SetBothScreensModesAndDisable(&sSaveDataWriteErrorGraphicsModes); InitBgFromTemplate(bg_config, 0, &sSaveDataWriteErrorBgTemplate, 0); BgClearTilemapBufferAndCommit(bg_config, GF_BG_LYR_MAIN_0); - LoadUserFrameGfx1(bg_config, GF_BG_LYR_MAIN_0, 0x01F7, 2, 0, heapId); - LoadFontPal0(GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_1_OFFSET, heapId); - BG_ClearCharDataRange(GF_BG_LYR_MAIN_0, 0x20, 0, heapId); + LoadUserFrameGfx1(bg_config, GF_BG_LYR_MAIN_0, 0x01F7, 2, 0, heapID); + LoadFontPal0(GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_1_OFFSET, heapID); + BG_ClearCharDataRange(GF_BG_LYR_MAIN_0, 0x20, 0, heapID); BG_SetMaskColor(GF_BG_LYR_MAIN_0, RGB(1, 1, 27)); BG_SetMaskColor(GF_BG_LYR_SUB_0, RGB(1, 1, 27)); - struct MsgData *msg_data = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0006_bin, heapId); - struct String *str = String_New(384, heapId); + struct MsgData *msg_data = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0006_bin, heapID); + struct String *str = String_New(384, heapID); ResetAllTextPrinters(); diff --git a/arm9/src/scrcmd.c b/arm9/src/scrcmd.c index 777b7222d..5f660c3fd 100644 --- a/arm9/src/scrcmd.c +++ b/arm9/src/scrcmd.c @@ -148,7 +148,7 @@ extern void sub_0205F378(SaveVarsFlags *flags, u16 state); extern BagScreenAppData *sub_0203789C(FieldSystem *fieldSystem, u8 mode); extern u16 sub_020378FC(BagScreenAppData *bagScreenAppData); extern void sub_02037E18(TaskManager *taskManager, u16 *param1, u16 *param2, u16 *param3); -extern void BeginNormalPaletteFade(u32 pattern, u32 typeTop, u32 typeBottom, u16 colour, u32 duration, u32 framesPer, HeapID heapId); +extern void BeginNormalPaletteFade(u32 pattern, u32 typeTop, u32 typeBottom, u16 colour, u32 duration, u32 framesPer, enum HeapID heapID); extern void sub_0200E388(u32 param0); extern BOOL IsPaletteFadeFinished(void); extern void CallTask_ScriptWarp(TaskManager *taskManager, u16 mapId, s32 param2, u16 x, u16 y, u16 dir); @@ -277,7 +277,7 @@ extern BOOL sub_020270D8(FashionCase *fashionCase, u32 param1, u16 param2); extern u16 sub_02027114(FashionCase *fashionCase, u16 param1); extern void sub_02027264(FashionCase *fashionCase, u16 param1); extern u16 sub_02027100(FashionCase *fashionCase, u16 param1); -extern PokedexAppData *sub_02038AF4(FieldSystem *fieldSystem, HeapID heapId, BOOL isNational); +extern PokedexAppData *sub_02038AF4(FieldSystem *fieldSystem, enum HeapID heapID, BOOL isNational); extern void ov06_0224CBB0(SaveData *saveData); extern u16 ov06_0224CC24(SaveData *saveData); extern u16 *LocalFieldData_GetSafariBallsCounter(LocalFieldData *localFieldData); @@ -294,10 +294,10 @@ extern void sub_0205F5A4(SaveVarsFlags *varsFlags, u16 param1); extern u16 sub_0205F594(SaveVarsFlags *varsFlags); extern void sub_0202AA00(SaveData *saveData); extern void Save_CreateRoamerByID(SaveData *saveData, u8 roamer); -extern NPCTradeAppData *NPCTradeApp_Init(HeapID heapId, u8 tradeId); +extern NPCTradeAppData *NPCTradeApp_Init(enum HeapID heapID, u8 tradeId); extern u16 NPCTradeApp_GetOfferedSpecies(NPCTradeAppData *npcTradeAppData); extern u16 NPCTradeApp_GetRequestedSpecies(NPCTradeAppData *npcTradeAppData); -extern void CallTask_NPCTrade(TaskManager *taskManager, NPCTradeAppData *npcTradeAppData, u16 partyPosition, HeapID heapId); +extern void CallTask_NPCTrade(TaskManager *taskManager, NPCTradeAppData *npcTradeAppData, u16 partyPosition, enum HeapID heapID); extern void NPCTradeApp_Delete(NPCTradeAppData *npcTradeAppData); extern void ov06_022411F4(TaskManager *taskManager, u16 *var); extern u16 ov05_021F61E8(u16 species); @@ -336,13 +336,13 @@ extern void sub_02034C24(FieldSystem *fieldSystem, u8 param1, u16 param2); extern u16 sub_0205F720(SaveVarsFlags *varsFlags); extern u16 sub_0205F740(SaveVarsFlags *varsFlags); extern u16 sub_0205F760(SaveVarsFlags *varsFlags); -extern Poffin *Poffin_New(HeapID heapId); +extern Poffin *Poffin_New(enum HeapID heapID); extern u32 sub_02027F04(Poffin *poffin, u8 *bytes, u8 param2, u32 param3); extern u16 sub_02028094(SavePoffinData *savePoffinData, Poffin *poffin); extern u16 sub_02028074(SavePoffinData *savePoffinData); extern u16 sub_0205F4A0(SaveVarsFlags *varsFlags, u8 eventId); -extern void *sub_02037A48(HeapID heapId, FieldSystem *fieldSystem, u16 param2); -extern void ov06_0224F12C(FieldSystem *fieldSystem, u16 *var, u32 param2, HeapID heapId); +extern void *sub_02037A48(enum HeapID heapID, FieldSystem *fieldSystem, u16 param2); +extern void ov06_0224F12C(FieldSystem *fieldSystem, u16 *var, u32 param2, enum HeapID heapID); extern u16 sub_0205F6A8(SaveVarsFlags *varsFlags); extern void ov06_02239944(TaskManager *taskManager); extern void ov06_02239AAC(TaskManager *taskManager); @@ -355,7 +355,7 @@ extern void sub_02033ED0(void); extern void FieldSystem_SyncMapObjectsToSave(FieldSystem *fieldSystem); extern Location *LocalFieldData_GetSpecialSpawnWarpPtr(LocalFieldData *localFieldData); extern u16 GetTrainerCardLevel(FieldSystem *fieldSystem); -extern SaveStatsPrinter *Field_SaveStatsPrinter_New(FieldSystem *fieldSystem, HeapID heapId, u32 param2); +extern SaveStatsPrinter *Field_SaveStatsPrinter_New(FieldSystem *fieldSystem, enum HeapID heapID, u32 param2); extern void Field_SaveStatsPrinter_Print(SaveStatsPrinter *saveStatsPrinter); extern void Field_SaveStatsPrinter_RemoveFromScreen(SaveStatsPrinter *saveStatsPrinter); extern void Field_SaveStatsPrinter_Delete(SaveStatsPrinter *saveStatsPrinter); @@ -392,7 +392,7 @@ static BOOL sub_0203B218(ScriptContext *ctx); /*static*/ BOOL sub_0203BB90(ScriptContext *ctx); static BOOL sub_0203BBBC(ScriptContext *ctx); static BOOL Script_CheckPortraitSlotFull(FieldSystem *fieldSystem, BOOL isContest, u32 portraitSlot); -static FashionAppData *sub_0203BC6C(HeapID heapId, FieldSystem *fieldSystem, BOOL isContest, u32 portraitSlot); +static FashionAppData *sub_0203BC6C(enum HeapID heapID, FieldSystem *fieldSystem, BOOL isContest, u32 portraitSlot); static BOOL sub_0203BE9C(ScriptContext *ctx); static BOOL sub_0203C71C(ScriptContext *ctx); static BOOL sub_0203C9F8(ScriptContext *ctx); @@ -1531,7 +1531,7 @@ BOOL ScrCmd_Unk02A1(ScriptContext *ctx) { // 02A1 GF_ASSERT(event); - u16 *unk4 = AllocFromHeap(HEAP_ID_4, 0x100); + u16 *unk4 = Heap_Alloc(HEAP_ID_4, 0x100); u16 xVal = (u16)MapObject_GetXCoord(event); u16 zVal = (u16)MapObject_GetZCoord(event); @@ -1591,7 +1591,7 @@ static BOOL IsAllMovementFinished(ScriptContext *ctx) { } static void sub_0203B174(FieldSystem *fieldSystem, u32 param1, void *param2) { - UnkStruct_0203B174 *unkStruct = (UnkStruct_0203B174 *)AllocFromHeap(HEAP_ID_4, sizeof(UnkStruct_0203B174)); + UnkStruct_0203B174 *unkStruct = (UnkStruct_0203B174 *)Heap_Alloc(HEAP_ID_4, sizeof(UnkStruct_0203B174)); if (unkStruct == NULL) { GF_AssertFail(); return; @@ -1614,10 +1614,10 @@ void sub_0203B1A8(SysTask *task, UnkStruct_0203B174 *param1) { SysTask_Destroy(param1->sysTask); if (param1->Unk08 != NULL) { - FreeToHeap(param1->Unk08); + Heap_Free(param1->Unk08); } - FreeToHeap(param1); + Heap_Free(param1); if (*movementCounter == 0) { GF_ASSERT(FALSE); @@ -1929,7 +1929,7 @@ BOOL ScrCmd_GetSelectedPartySlot(ScriptContext *ctx) { // 0193 if (*variable == 7) { *variable = 0xFF; } - FreeToHeap(*partyMenu); + Heap_Free(*partyMenu); *partyMenu = NULL; return FALSE; } @@ -1961,7 +1961,7 @@ BOOL ScrCmd_Unk0195(ScriptContext *ctx) { // 0195 *unk1 = sub_02037A70(*partyMenuData); *unk1 = (*unk1 == TRUE); - FreeToHeap(*partyMenuData); + Heap_Free(*partyMenuData); *partyMenuData = NULL; return FALSE; } @@ -1982,7 +1982,7 @@ BOOL ScrCmd_Unk0197(ScriptContext *ctx) { // 0197 GF_ASSERT(*runningAppData); *unk0 = sub_02037A78(*runningAppData); - FreeToHeap(*runningAppData); + Heap_Free(*runningAppData); *runningAppData = NULL; return FALSE; @@ -2024,7 +2024,7 @@ BOOL ScrCmd_DummyGetMapPosition(ScriptContext *ctx) { // 009F if (FieldSystem_ApplicationIsRunning(fieldSystem)) { return FALSE; } - FreeToHeap(*runningAppData); + Heap_Free(*runningAppData); *runningAppData = NULL; return TRUE; } @@ -2039,7 +2039,7 @@ static BOOL sub_0203BBBC(ScriptContext *ctx) { if (pcBoxData->unk08 == TRUE) { sub_02028AD4(fieldSystem->unk98, sub_02029048(11), 1); } - FreeToHeap(*pcBoxDataPtr); + Heap_Free(*pcBoxDataPtr); *pcBoxDataPtr = NULL; return TRUE; } @@ -2072,12 +2072,12 @@ static BOOL Script_CheckPortraitSlotFull(FieldSystem *fieldSystem, BOOL isContes return TRUE; } -static FashionAppData *sub_0203BC6C(HeapID heapId, FieldSystem *fieldSystem, BOOL isContest, u32 portraitSlot) { +static FashionAppData *sub_0203BC6C(enum HeapID heapID, FieldSystem *fieldSystem, BOOL isContest, u32 portraitSlot) { SaveFashionData *fashionData = Save_FashionData_Get(fieldSystem->saveData); if (!Script_CheckPortraitSlotFull(fieldSystem, isContest, portraitSlot)) { return NULL; } - FashionAppData *appData = AllocFromHeap(heapId, sizeof(FashionAppData)); + FashionAppData *appData = Heap_Alloc(heapID, sizeof(FashionAppData)); memset(appData, 0, sizeof(FashionAppData)); appData->fashionData = fashionData; appData->isContest = isContest; @@ -2099,7 +2099,7 @@ BOOL ScrCmd_GetDressupPortraitSlot(ScriptContext *ctx) { // 00A4 FashionAppData **runningAppData = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); u16 *portraitSlotPtr = ScriptGetVarPointer(ctx); *portraitSlotPtr = (*runningAppData)->portraitSlot; - FreeToHeap(*runningAppData); + Heap_Free(*runningAppData); return FALSE; } @@ -2255,7 +2255,7 @@ BOOL ScrCmd_ShowSealCapsuleEditor(ScriptContext *ctx) { // 00A9 BOOL ScrCmd_ShowTownMapScreen(ScriptContext *ctx) { // 00AA TownMapAppData **townMap = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); - *townMap = AllocFromHeap(HEAP_ID_FIELD, sizeof(TownMapAppData)); + *townMap = Heap_Alloc(HEAP_ID_FIELD, sizeof(TownMapAppData)); TownMap_Init(ctx->fieldSystem, *townMap, 2); TownMap_Show(ctx->fieldSystem, *townMap); SetupNativeScript(ctx, sub_0203BB90); @@ -2288,7 +2288,7 @@ BOOL ScrCmd_Unk01D9(ScriptContext *ctx) { // 01D9 u16 unk0 = ScriptGetVar(ctx); u16 unk1 = ScriptGetVar(ctx); ScrCmdUnkStruct01D9 **unkStructPtr = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); - *unkStructPtr = AllocFromHeap(HEAP_ID_FIELD, sizeof(ScrCmdUnkStruct01D9)); + *unkStructPtr = Heap_Alloc(HEAP_ID_FIELD, sizeof(ScrCmdUnkStruct01D9)); ScrCmdUnkStruct01D9 *unkStruct = *unkStructPtr; MI_CpuFill8(unkStruct, 0, sizeof(ScrCmdUnkStruct01D9)); // consider inlining as is in heartgold unkStruct->unk04 = unk0; @@ -2301,7 +2301,7 @@ BOOL ScrCmd_Unk01D9(ScriptContext *ctx) { // 01D9 BOOL ScrCmd_ShowPCBoxScreen(ScriptContext *ctx) { // 00AB PCBoxAppData **pcBoxAppDataPtr = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); - PCBoxAppData *pcBoxAppData = AllocFromHeap(HEAP_ID_FIELD, sizeof(PCBoxAppData)); // also seems inlined + PCBoxAppData *pcBoxAppData = Heap_Alloc(HEAP_ID_FIELD, sizeof(PCBoxAppData)); // also seems inlined pcBoxAppData->save = ctx->fieldSystem->saveData; pcBoxAppData->operation = (enum PCBoxOperation)ScriptReadByte(ctx); *pcBoxAppDataPtr = pcBoxAppData; @@ -2366,7 +2366,7 @@ BOOL ScrCmd_Unk00B3(ScriptContext *ctx) { // 00B3 BOOL ScrCmd_StarterSelectionScreen(ScriptContext *ctx) { // 00B4 StarterSelectionData **starterSelectionPtr = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR); - *starterSelectionPtr = AllocFromHeap(HEAP_ID_FIELD, sizeof(StarterSelectionData)); + *starterSelectionPtr = Heap_Alloc(HEAP_ID_FIELD, sizeof(StarterSelectionData)); StarterSelectionData *starterSelectionData = *starterSelectionPtr; // consider inlining starterSelectionData->options = Save_PlayerData_GetOptionsAddr(ctx->fieldSystem->saveData); sub_020386A4(ctx->fieldSystem, *starterSelectionPtr); @@ -2378,7 +2378,7 @@ BOOL ScrCmd_EndStarterSelectionScreen(ScriptContext *ctx) { // 00B5 StarterSelectionData **starterSelectionData = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR); SaveVarsFlags *flags = Save_VarsFlags_Get(ctx->fieldSystem->saveData); sub_0205F378(flags, (*starterSelectionData)->state); - FreeToHeap(*starterSelectionData); + Heap_Free(*starterSelectionData); return FALSE; } @@ -2399,7 +2399,7 @@ BOOL ScrCmd_GetBagScreenSelection(ScriptContext *ctx) { // 0179 GF_ASSERT(*bagData != NULL); *var = sub_020378FC(*bagData); // BagData_GetSelection? - FreeToHeap(*bagData); + Heap_Free(*bagData); *bagData = NULL; return FALSE; } @@ -2734,7 +2734,7 @@ BOOL ScrCmd_Unk00F6(ScriptContext *ctx) { // 00F6 ScrCmdUnkStruct00F4 **appDataPtr = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); ScrCmdUnkStruct00F4 *appData = *appDataPtr; sub_02047174(ctx->fieldSystem->taskManager, &appData->unk2C, 5); - FreeToHeap(appData); + Heap_Free(appData); *appDataPtr = NULL; return TRUE; } @@ -3021,7 +3021,7 @@ BOOL ScrCmd_Unk02BA(ScriptContext *ctx) { // 02BA *var = sub_020527A8(ctx->fieldSystem->unk78); if (*var) { void **runningAppData = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); - FreeToHeap(*runningAppData); + Heap_Free(*runningAppData); } return FALSE; } @@ -4015,7 +4015,7 @@ static void Script_SetMonSeenFlagBySpecies(FieldSystem *fieldSystem, u16 species ZeroMonData(mon); CreateMon(mon, species, 50, 32, FALSE, 0, OT_ID_PLAYER_ID, 0); Pokedex_SetMonSeenFlag(pokedex, mon); - FreeToHeap(mon); + Heap_Free(mon); } BOOL ScrCmd_CountPCFreeSpace(ScriptContext *ctx) { // 0252 @@ -4501,7 +4501,7 @@ BOOL ScrCmd_Unk0289(ScriptContext *ctx) { // 0289 u32 unk1 = sub_02027F04(poffin, bytes, unk0, 0); SavePoffinData *poffinSave = Save_PoffinData_Get(ctx->fieldSystem->saveData); u16 unk2 = sub_02028094(poffinSave, poffin); - FreeToHeap(poffin); + Heap_Free(poffin); if (unk2 == 0xFFFF) { *var = -1; @@ -4536,15 +4536,15 @@ BOOL ScrCmd_Unk028F(ScriptContext *ctx) { // 028F HallOfFame *hallOfFame = LoadHallOfFame(ctx->fieldSystem->saveData, HEAP_ID_32, &loadResult); if (loadResult == 0) { *var = 0; - FreeToHeap(hallOfFame); + Heap_Free(hallOfFame); return TRUE; } else if (loadResult == 1) { *var = Save_HOF_TranslateRecordIdx(hallOfFame, 0); - FreeToHeap(hallOfFame); + Heap_Free(hallOfFame); return TRUE; } else if (loadResult == 2) { *var = 0; - FreeToHeap(hallOfFame); + Heap_Free(hallOfFame); return TRUE; } *var = 0; @@ -4570,7 +4570,7 @@ BOOL ScrCmd_Unk0291(ScriptContext *ctx) { // 0291 } *var2 = sub_02037A70(*partyMenu); *var2 = (*var2 == TRUE); - FreeToHeap(*partyMenu); + Heap_Free(*partyMenu); *partyMenu = NULL; return FALSE; } diff --git a/arm9/src/scrcmd_13.c b/arm9/src/scrcmd_13.c index 7dc443567..34b16e384 100644 --- a/arm9/src/scrcmd_13.c +++ b/arm9/src/scrcmd_13.c @@ -19,7 +19,7 @@ extern u16 sub_0204BAD4(struct FieldSystem *); extern u16 sub_0204BAE4(struct FieldSystem *); extern void sub_0205F224(struct SaveVarsFlags *state); extern void sub_0205F234(struct SaveVarsFlags *state); -extern void sub_0208089C(struct Pokemon *pokemon, PlayerProfile *player, u32 a2, u32 a3, HeapID heapId); +extern void sub_0208089C(struct Pokemon *pokemon, PlayerProfile *player, u32 a2, u32 a3, enum HeapID heapID); BOOL ScrCmd_Unk0253(struct ScriptContext *ctx) // 0253 { @@ -52,7 +52,7 @@ BOOL ScrCmd_Unk0254(struct ScriptContext *ctx) // 0254 *ret_ptr = 0; } - FreeToHeap(pokemon); + Heap_Free(pokemon); return FALSE; } @@ -75,7 +75,7 @@ BOOL ScrCmd_Unk0255(struct ScriptContext *ctx) // 0255 sub_0202C144(ctx->fieldSystem->saveData, pokemon); } - FreeToHeap(pokemon); + Heap_Free(pokemon); sub_0202BEDC(unk); return FALSE; diff --git a/arm9/src/scrcmd_move_relearner.c b/arm9/src/scrcmd_move_relearner.c index df8febbed..114f3707d 100644 --- a/arm9/src/scrcmd_move_relearner.c +++ b/arm9/src/scrcmd_move_relearner.c @@ -8,7 +8,7 @@ extern void *FieldSysGetAttrAddr(struct FieldSystem *, int idx); -extern struct UnkStruct_02037CF0 *sub_02037CF0(HeapID heapId, struct FieldSystem *, u8); +extern struct UnkStruct_02037CF0 *sub_02037CF0(enum HeapID heapID, struct FieldSystem *, u8); extern u8 sub_02037D5C(struct UnkStruct_02037CF0 *); extern void sub_02038864(struct FieldSystem *, MoveRelearner *moveRelearner); extern BOOL sub_0203BC04(struct ScriptContext *ctx); @@ -32,7 +32,7 @@ BOOL ScrCmd_Unk01C7(struct ScriptContext *ctx) { // 01C7 - todo: StoreMove? *ret_ptr = 0xFF; } - FreeToHeap(*runningAppData); + Heap_Free(*runningAppData); *runningAppData = NULL; return FALSE; } @@ -51,7 +51,7 @@ BOOL ScrCmd_Unk021F(struct ScriptContext *ctx) { // 021F u16 *eligibleMoves = MoveRelearner_GetEligibleLevelUpMoves(pokemon, HEAP_ID_32); *ret_ptr = (u16)MoveRelearner_IsValidMove(eligibleMoves); - FreeToHeap(eligibleMoves); + Heap_Free(eligibleMoves); return FALSE; } @@ -72,7 +72,7 @@ void sub_02045E74(struct ScriptContext *ctx, u8 a1, struct Pokemon *pokemon, u16 sub_02038864(ctx->fieldSystem, moveRelearner); SetupNativeScript(ctx, sub_0203BC04); - FreeToHeap(eligibleMoves); + Heap_Free(eligibleMoves); } BOOL ScrCmd_Unk0220(struct ScriptContext *ctx) // 0220 @@ -99,7 +99,7 @@ BOOL ScrCmd_Unk0224(struct ScriptContext *ctx) // 0224 - todo: TeachMove? struct Party *party = SaveArray_Party_Get(ctx->fieldSystem->saveData); struct Pokemon *pokemon = Party_GetMonByIndex(party, mon_idx); - u16 *eligibleMoves = AllocFromHeap(HEAP_ID_32, 2 * sizeof(u16)); + u16 *eligibleMoves = Heap_Alloc(HEAP_ID_32, 2 * sizeof(u16)); eligibleMoves[0] = move; eligibleMoves[1] = 0xFFFF; diff --git a/arm9/src/scrcmd_names.c b/arm9/src/scrcmd_names.c index d9c9d2030..e36139162 100644 --- a/arm9/src/scrcmd_names.c +++ b/arm9/src/scrcmd_names.c @@ -24,7 +24,7 @@ extern PCStorage *SaveArray_PCStorage_Get(SaveData *save); extern u32 sub_0205F3C0(SaveVarsFlags *state); extern u32 sub_02054C14(u32 number); -static String *sub_02040AE4(u32 msg_no, HeapID heapId); +static String *sub_02040AE4(u32 msg_no, enum HeapID heapID); BOOL ScrCmd_GetPlayerName(ScriptContext *ctx) // 00CD - todo: BufferPlayerName? TextPlayerName? { @@ -235,9 +235,9 @@ BOOL ScrCmd_Unk00DA(ScriptContext *ctx) // 00DA - todo: BufferPokemonSpeciesName return FALSE; } -static String *sub_02040AE4(u32 msg_no, HeapID heapId) // todo: GetPokemonSpeciesName? +static String *sub_02040AE4(u32 msg_no, enum HeapID heapID) // todo: GetPokemonSpeciesName? { - MsgData *msg_data = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0362_bin, heapId); + MsgData *msg_data = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0362_bin, heapID); String *ret = NewString_ReadMsgData(msg_data, msg_no); DestroyMsgData(msg_data); diff --git a/arm9/src/scrcmd_party.c b/arm9/src/scrcmd_party.c index e2ced949c..97ee462ce 100644 --- a/arm9/src/scrcmd_party.c +++ b/arm9/src/scrcmd_party.c @@ -91,7 +91,7 @@ BOOL ScrCmd_GiveEgg(struct ScriptContext *ctx) // 0097 ov05_SetEggStats(egg, species, 1, player, 3, met_loc); Party_AddMon(party, egg); - FreeToHeap(egg); + Heap_Free(egg); } return FALSE; diff --git a/arm9/src/script_pokemon_util.c b/arm9/src/script_pokemon_util.c index 752997aee..dd32e502d 100644 --- a/arm9/src/script_pokemon_util.c +++ b/arm9/src/script_pokemon_util.c @@ -24,34 +24,34 @@ BOOL MonNotFaintedOrEgg(struct Pokemon *pokemon) { return TRUE; } -BOOL GiveMon(HeapID heapId, struct SaveData *save, u16 species, u8 level, u16 item, u32 mapSec, u32 encounterType) { +BOOL GiveMon(enum HeapID heapID, struct SaveData *save, u16 species, u8 level, u16 item, u32 mapSec, u32 encounterType) { u32 ptr; PlayerProfile *data = Save_PlayerData_GetProfile(save); struct Party *party = SaveArray_Party_Get(save); - struct Pokemon *mon = AllocMonZeroed(heapId); + struct Pokemon *mon = AllocMonZeroed(heapID); ZeroMonData(mon); CreateMon(mon, species, level, 32, 0, 0, OT_ID_PLAYER_ID, 0); - sub_0206A014(mon, data, ITEM_POKE_BALL, mapSec, encounterType, heapId); + sub_0206A014(mon, data, ITEM_POKE_BALL, mapSec, encounterType, heapID); ptr = item; SetMonData(mon, MON_DATA_HELD_ITEM, &ptr); BOOL isAdded = Party_AddMon(party, mon); if (isAdded) { sub_0202C144(save, mon); } - FreeToHeap(mon); + Heap_Free(mon); return isAdded; } /* Seems to have something to do with Manaphy Egg*/ -BOOL GiveEgg(HeapID heapId, struct SaveData *save, u16 species, int level, int metLocIndex, int a3) { -#pragma unused(heapId) +BOOL GiveEgg(enum HeapID heapID, struct SaveData *save, u16 species, int level, int metLocIndex, int a3) { +#pragma unused(heapID) PlayerProfile *data = Save_PlayerData_GetProfile(save); struct Party *party = SaveArray_Party_Get(save); struct Pokemon *mon = AllocMonZeroed(HEAP_ID_32); ZeroMonData(mon); ov05_SetEggStats(mon, species, level, data, 4, sub_02015CF8(metLocIndex, a3)); BOOL isAdded = Party_AddMon(party, mon); - FreeToHeap(mon); + Heap_Free(mon); return isAdded; } diff --git a/arm9/src/task.c b/arm9/src/task.c index c06726158..897b827d0 100644 --- a/arm9/src/task.c +++ b/arm9/src/task.c @@ -6,7 +6,7 @@ #include "script.h" struct TaskManager *Task_New(struct FieldSystem *fieldSystem, TaskFunc taskFunc, void *env) { - struct TaskManager *taskManager = AllocFromHeapAtEnd(HEAP_ID_32, sizeof(struct TaskManager)); + struct TaskManager *taskManager = Heap_AllocAtEnd(HEAP_ID_32, sizeof(struct TaskManager)); taskManager->prev = NULL; taskManager->func = taskFunc; taskManager->state = 0; @@ -14,7 +14,7 @@ struct TaskManager *Task_New(struct FieldSystem *fieldSystem, TaskFunc taskFunc, taskManager->unk10 = NULL; taskManager->unk14 = NULL; taskManager->fieldSystem = fieldSystem; - taskManager->unk1C = AllocFromHeapAtEnd(HEAP_ID_32, 4); + taskManager->unk1C = Heap_AllocAtEnd(HEAP_ID_32, 4); return taskManager; } @@ -28,7 +28,7 @@ void TaskManager_Jump(struct TaskManager *taskManager, TaskFunc taskFunc, void * taskManager->state = 0; taskManager->env = env; if (taskManager->unk14 != NULL || taskManager->unk14 != NULL) { - FreeToHeap(taskManager->unk14); + Heap_Free(taskManager->unk14); taskManager->unk10 = NULL; taskManager->unk14 = NULL; } @@ -47,10 +47,10 @@ BOOL sub_02046420(struct TaskManager *taskManager) { while (taskManager->unk10->func(taskManager->unk10) == TRUE) { struct TaskManager *taskManager2 = taskManager->unk10->prev; if (taskManager->unk10->unk14 != NULL) { - FreeToHeap(taskManager->unk10->unk14); + Heap_Free(taskManager->unk10->unk14); } - FreeToHeap(taskManager->unk10->unk1C); - FreeToHeap(taskManager->unk10); + Heap_Free(taskManager->unk10->unk1C); + Heap_Free(taskManager->unk10); taskManager->unk10 = taskManager2; if (taskManager2 == NULL) { return TRUE; @@ -85,7 +85,7 @@ BOOL sub_020464B8(struct TaskManager *taskManager) { break; case 1: if (!FieldSystem_ApplicationIsRunning(fieldSystem)) { - FreeToHeap(r4_2); + Heap_Free(r4_2); return TRUE; } break; @@ -94,7 +94,7 @@ BOOL sub_020464B8(struct TaskManager *taskManager) { } void sub_02046500(struct TaskManager *taskManager, u32 r5, u32 r4) { - u32 *r2 = AllocFromHeapAtEnd(HEAP_ID_32, 3 * sizeof(u32)); + u32 *r2 = Heap_AllocAtEnd(HEAP_ID_32, 3 * sizeof(u32)); r2[0] = 0; r2[1] = r5; r2[2] = r4; diff --git a/arm9/src/text.c b/arm9/src/text.c index cdb27de57..167ae4480 100644 --- a/arm9/src/text.c +++ b/arm9/src/text.c @@ -59,7 +59,7 @@ void sub_0201BCFC(u8 textPrinterNumber) { struct TextPrinter *printer = sub_0201B6C8(); if (printer) { sub_0201C238(printer); - FreeToHeap((void *)printer); + Heap_Free((void *)printer); } SysTask_Destroy(UNK_021C5714[textPrinterNumber]); UNK_021C5714[textPrinterNumber] = NULL; @@ -154,7 +154,7 @@ u16 AddTextPrinter(struct TextPrinterTemplate *printerTemplate, u32 speed, u8 (* return 0xff; } - struct TextPrinter *printer = (struct TextPrinter *)AllocFromHeap(HEAP_ID_DEFAULT, sizeof(struct TextPrinter)); + struct TextPrinter *printer = (struct TextPrinter *)Heap_Alloc(HEAP_ID_DEFAULT, sizeof(struct TextPrinter)); printer->active = TRUE; printer->state = 0; @@ -191,7 +191,7 @@ u16 AddTextPrinter(struct TextPrinterTemplate *printerTemplate, u32 speed, u8 (* CopyWindowToVram(printer->printerTemplate.window); } sub_0201C238(printer); - FreeToHeap((void *)printer); + Heap_Free((void *)printer); return 8; } } @@ -288,11 +288,11 @@ void sub_0201C1A8(struct TextPrinter *printer) { } u16 *sub_0201C1B0(void) { - void *res = AllocFromHeap(HEAP_ID_DEFAULT, 32 * 24 * sizeof(u16)); + void *res = Heap_Alloc(HEAP_ID_DEFAULT, 32 * 24 * sizeof(u16)); struct NNSG2dCharacterData *var; void *tmp = GfGfxLoader_GetCharData(NARC_GRAPHIC_FONT, NARC_font_narc_0005_NCGR, 0, &var, HEAP_ID_DEFAULT); MI_CpuCopy32(var->pRawData, res, 32 * 24 * sizeof(u16)); - FreeToHeap(tmp); + Heap_Free(tmp); return res; } @@ -311,6 +311,6 @@ void sub_0201C238(struct TextPrinter *printer) { if (printer->Unk2C == NULL) { return; } - FreeToHeap(printer->Unk2C); + Heap_Free(printer->Unk2C); printer->Unk2C = NULL; } diff --git a/arm9/src/trainer_data.c b/arm9/src/trainer_data.c index 02b7f6ddb..f8e1c0253 100644 --- a/arm9/src/trainer_data.c +++ b/arm9/src/trainer_data.c @@ -15,14 +15,14 @@ #include "unk_02024E64.h" // Loads all battle opponents, including multi-battle partner if exists. -void EnemyTrainerSet_Init(BattleSetup *setup, struct SaveData *save, HeapID heapId) { +void EnemyTrainerSet_Init(BattleSetup *setup, struct SaveData *save, enum HeapID heapID) { Trainer trdata; struct MsgData *msgData; u16 *rivalName; s32 i; struct String *str; - msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0559_bin, heapId); + msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0559_bin, heapID); rivalName = GetRivalNamePtr(sub_02024EC0(save)); for (i = 0; i < 4; i++) { if (setup->trainerId[i] != 0) { @@ -35,7 +35,7 @@ void EnemyTrainerSet_Init(BattleSetup *setup, struct SaveData *save, HeapID heap CopyStringToU16Array(str, setup->trainers[i].name, PLAYER_NAME_LENGTH + 1); String_Delete(str); } - CreateNPCTrainerParty(setup, i, heapId); + CreateNPCTrainerParty(setup, i, heapID); } } setup->flags |= trdata.data.doubleBattle; @@ -87,7 +87,7 @@ s32 TrainerData_GetAttr(u32 tr_idx, u32 attr_no) { // however the trainers are not in order in this file. trtblofs gives a pointer into trtbl // for each trainer. trtblofs is also a single-member NARC whose entries are shorts, one // per NPC trainer. -BOOL TrainerMessageWithIdPairExists(u32 trainer_idx, u32 msg_id, HeapID heapId) { +BOOL TrainerMessageWithIdPairExists(u32 trainer_idx, u32 msg_id, enum HeapID heapID) { u16 rdbuf[3]; struct NARC *trTblNarc; BOOL ret = FALSE; @@ -95,7 +95,7 @@ BOOL TrainerMessageWithIdPairExists(u32 trainer_idx, u32 msg_id, HeapID heapId) trTblSize = GetNarcMemberSizeByIdPair(NARC_POKETOOL_TRMSG_TRTBL, 0); ReadFromNarcMemberByIdPair(&rdbuf[0], NARC_POKETOOL_TRMSG_TRTBLOFS, 0, trainer_idx * 2, 2); - trTblNarc = NARC_New(NARC_POKETOOL_TRMSG_TRTBL, heapId); + trTblNarc = NARC_New(NARC_POKETOOL_TRMSG_TRTBL, heapID); while (rdbuf[0] != trTblSize) { NARC_ReadFromMember(trTblNarc, 0, rdbuf[0], 4, &rdbuf[1]); if (rdbuf[1] == trainer_idx && rdbuf[2] == msg_id) { @@ -111,18 +111,18 @@ BOOL TrainerMessageWithIdPairExists(u32 trainer_idx, u32 msg_id, HeapID heapId) return ret; } -void GetTrainerMessageByIdPair(u32 trainer_idx, u32 msg_id, struct String *str, HeapID heapId) { +void GetTrainerMessageByIdPair(u32 trainer_idx, u32 msg_id, struct String *str, enum HeapID heapID) { u16 rdbuf[3]; u32 trTblSize; struct NARC *trTblNarc; trTblSize = GetNarcMemberSizeByIdPair(NARC_POKETOOL_TRMSG_TRTBL, 0); ReadFromNarcMemberByIdPair(&rdbuf[0], NARC_POKETOOL_TRMSG_TRTBLOFS, 0, trainer_idx * 2, 2); - trTblNarc = NARC_New(NARC_POKETOOL_TRMSG_TRTBL, heapId); + trTblNarc = NARC_New(NARC_POKETOOL_TRMSG_TRTBL, heapID); while (rdbuf[0] != trTblSize) { NARC_ReadFromMember(trTblNarc, 0, rdbuf[0], 4, &rdbuf[1]); if (rdbuf[1] == trainer_idx && rdbuf[2] == msg_id) { - ReadMsgData_NewNarc_ExistingString(NARC_MSGDATA_MSG, 558, (u32)(rdbuf[0] / 4), heapId, str); + ReadMsgData_NewNarc_ExistingString(NARC_MSGDATA_MSG, 558, (u32)(rdbuf[0] / 4), heapID, str); break; } rdbuf[0] += 4; @@ -247,7 +247,7 @@ int TrainerClass_GetGenderOrTrainerCount(int a0) { return sTrainerClassGenderCountTbl[a0]; } -void CreateNPCTrainerParty(BattleSetup *setup, s32 party_id, HeapID heapId) { +void CreateNPCTrainerParty(BattleSetup *setup, s32 party_id, enum HeapID heapID) { union TrainerMon *data; s32 i; s32 j; @@ -266,8 +266,8 @@ void CreateNPCTrainerParty(BattleSetup *setup, s32 party_id, HeapID heapId) { // state seed_bak = GetLCRNGSeed(); Party_InitWithMaxSize(setup->party[party_id], PARTY_SIZE); - data = (union TrainerMon *)AllocFromHeap(heapId, sizeof(union TrainerMon) * PARTY_SIZE); - pokemon = AllocMonZeroed(heapId); + data = (union TrainerMon *)Heap_Alloc(heapID, sizeof(union TrainerMon) * PARTY_SIZE); + pokemon = AllocMonZeroed(heapID); TrainerData_ReadTrPoke(setup->trainerId[party_id], data); // If a Pokemon's gender ratio is 50/50, the generated Pokemon will be the same @@ -367,7 +367,7 @@ void CreateNPCTrainerParty(BattleSetup *setup, s32 party_id, HeapID heapId) { break; } } - FreeToHeap(data); - FreeToHeap(pokemon); + Heap_Free(data); + Heap_Free(pokemon); SetLCRNGSeed(seed_bak); } diff --git a/arm9/src/unk_020040F4.c b/arm9/src/unk_020040F4.c index e43274010..0aadca633 100644 --- a/arm9/src/unk_020040F4.c +++ b/arm9/src/unk_020040F4.c @@ -712,7 +712,7 @@ void sub_02004AF8(u32 param0, s32 param1) { NNS_SndWaveOutSetVolume(*(u32 *)sub_02004930(param0), param1); } -u32 sub_02004B30(u32 param0, s32 param1, s32 param2, u32 param3, HeapID heapId) { +u32 sub_02004B30(u32 param0, s32 param1, s32 param2, u32 param3, enum HeapID heapID) { GetSoundDataPointer(); void **r4 = sub_02003D38(33); @@ -731,7 +731,7 @@ u32 sub_02004B30(u32 param0, s32 param1, s32 param2, u32 param3, HeapID heapId) } if (param3 == 14) { - void *ptr = AllocFromHeap(heapId, r6); + void *ptr = Heap_Alloc(heapID, r6); *r4 = ptr; if (ptr == NULL) { GF_AssertFail(); @@ -788,7 +788,7 @@ void sub_02004C3C(u32 param0) { if (*ptr == 1) { *ptr = 0; - FreeToHeap(*ptr2); + Heap_Free(*ptr2); } } diff --git a/arm9/src/unk_020051F4.c b/arm9/src/unk_020051F4.c index a2276a259..aec76d3b0 100644 --- a/arm9/src/unk_020051F4.c +++ b/arm9/src/unk_020051F4.c @@ -307,7 +307,7 @@ BOOL sub_02005670() { return GF_SndPlayerCountPlayingSeqByPlayerNo(0); } -u32 sub_020056AC(u32 param0, u16 param1, s32 param2, s32 param3, HeapID heapId) { +u32 sub_020056AC(u32 param0, u16 param1, s32 param2, s32 param3, enum HeapID heapID) { s32 st1c, st18; u8 *st14 = sub_02003D38(15); u8 *st10 = sub_02003D38(16); @@ -374,7 +374,7 @@ u32 sub_020056AC(u32 param0, u16 param1, s32 param2, s32 param3, HeapID heapId) sub_02005578(species); GF_SndPlayerSetTrackPan(1, 0xFFFF, param2); sub_02005AC8(species, 1, param3); - sub_02005AE0(20, heapId); + sub_02005AE0(20, heapID); break; case 2: sub_02005578(species); @@ -389,7 +389,7 @@ u32 sub_020056AC(u32 param0, u16 param1, s32 param2, s32 param3, HeapID heapId) sub_02005578(species); GF_SndPlayerSetTrackPan(1, 0xFFFF, param2); sub_02005AC8(species, 1, param3); - sub_02005AE0(30, heapId); + sub_02005AE0(30, heapID); GF_SndPlayerSetTrackPitch(1, 0xFFFF, 192); sub_02005BC8(species, 16); GF_SndPlayerSetTrackPan(8, 0xFFFF, param2); @@ -397,11 +397,11 @@ u32 sub_020056AC(u32 param0, u16 param1, s32 param2, s32 param3, HeapID heapId) break; case 4: sub_02004984(14); - sub_02004B30(species, param3, st1c, 14, heapId); + sub_02004B30(species, param3, st1c, 14, heapID); sub_02004ACC(14, (u8)st1c); - sub_02005AE0(15, heapId); + sub_02005AE0(15, heapID); sub_02004AE4(14, 34304); - sub_02005BF8(species, -64, st18, st1c, heapId); + sub_02005BF8(species, -64, st18, st1c, heapID); sub_02004AE4(15, 34304); break; case 5: @@ -423,28 +423,28 @@ u32 sub_020056AC(u32 param0, u16 param1, s32 param2, s32 param3, HeapID heapId) sub_02005578(species); GF_SndPlayerSetTrackPan(1, 0xFFFF, param2); sub_02005AC8(species, 1, param3); - sub_02005AE0(11, heapId); + sub_02005AE0(11, heapID); GF_SndPlayerSetTrackPitch(1, 0xFFFF, -128); break; case 8: sub_02005578(species); GF_SndPlayerSetTrackPan(1, 0xFFFF, param2); sub_02005AC8(species, 1, param3); - sub_02005AE0(60, heapId); + sub_02005AE0(60, heapID); GF_SndPlayerSetTrackPitch(1, 0xFFFF, 60); break; case 9: sub_02004984(14); - sub_02004B30(species, param3, st1c, 14, heapId); + sub_02004B30(species, param3, st1c, 14, heapID); sub_02004ACC(14, (u8)st1c); - sub_02005AE0(13, heapId); + sub_02005AE0(13, heapID); sub_02004AE4(14, 26624); break; case 10: sub_02005578(species); GF_SndPlayerSetTrackPan(1, 0xFFFF, param2); sub_02005AC8(species, 1, param3); - sub_02005AE0(100, heapId); + sub_02005AE0(100, heapID); GF_SndPlayerSetTrackPitch(1, 0xFFFF, -44); break; case 11: @@ -457,7 +457,7 @@ u32 sub_020056AC(u32 param0, u16 param1, s32 param2, s32 param3, HeapID heapId) sub_02005578(species); GF_SndPlayerSetTrackPan(1, 0xFFFF, param2); sub_02005AC8(species, 1, param3); - sub_02005AE0(20, heapId); + sub_02005AE0(20, heapID); GF_SndPlayerSetTrackPitch(1, 0xFFFF, -96); break; case 13: @@ -480,11 +480,11 @@ void sub_02005AC8(u32 param0, int playerNo, s32 param2) { sub_02004858(param0, playerNo); } -void sub_02005AE0(u32 param0, HeapID heapId) { +void sub_02005AE0(u32 param0, enum HeapID heapID) { u32 *r6 = sub_02003D38(34); sub_02005BA0(); - u32 *ptr = AllocFromHeap(heapId, 2 * sizeof(u32)); + u32 *ptr = Heap_Alloc(heapID, 2 * sizeof(u32)); if (ptr == NULL) { GF_AssertFail(); return; @@ -541,7 +541,7 @@ void sub_02005BA0() { if (*r4 != NULL) { void *r5 = sub_0201B6C8(*r4); SysTask_Destroy(*r4); - FreeToHeap(r5); + Heap_Free(r5); } *r4 = 0; @@ -558,12 +558,12 @@ u32 sub_02005BC8(u16 param0, s32 param1) { return res; } -void sub_02005BF8(u32 param0, s32 param1, s32 param2, s32 param3, HeapID heapId) { +void sub_02005BF8(u32 param0, s32 param1, s32 param2, s32 param3, enum HeapID heapID) { #pragma unused(param1) *(u8 *)sub_02003D38(17) = 1; sub_02004984(15); - sub_02004B30(param0, param2, param3, 15, heapId); + sub_02004B30(param0, param2, param3, 15, heapID); } u32 PlaySound(u16 param0) { diff --git a/arm9/src/unk_020061E8.c b/arm9/src/unk_020061E8.c index c34ab912b..bdfc2710b 100644 --- a/arm9/src/unk_020061E8.c +++ b/arm9/src/unk_020061E8.c @@ -7,10 +7,10 @@ extern struct TextPrinter *sub_0201B6C8(void); -SysTask *sub_020061E8(SysTaskFunc func, u32 r1, u32 r2, HeapID heapId) { +SysTask *sub_020061E8(SysTaskFunc func, u32 r1, u32 r2, enum HeapID heapID) { void *r4; if (r1 != 0) { - r4 = AllocFromHeap(heapId, r1); + r4 = Heap_Alloc(heapID, r1); if (r4 == 0) { return NULL; } @@ -24,7 +24,7 @@ SysTask *sub_020061E8(SysTaskFunc func, u32 r1, u32 r2, HeapID heapId) { void sub_0200621C(SysTask *sysTask) { struct TextPrinter *textPrinter = sub_0201B6C8(); if (textPrinter != NULL) { - FreeToHeap(textPrinter); + Heap_Free(textPrinter); } SysTask_Destroy(sysTask); } diff --git a/arm9/src/unk_02006D98.c b/arm9/src/unk_02006D98.c index 13b4d50fc..a59d42e9c 100644 --- a/arm9/src/unk_02006D98.c +++ b/arm9/src/unk_02006D98.c @@ -302,21 +302,21 @@ extern void NNS_G2dDrawSpriteFast(s16 param0, int param7, int param8); -struct UnkStruct_02006D98 *sub_02006D98(HeapID heapId) { - struct UnkStruct_02006D98 *ptr = AllocFromHeap(heapId, sizeof(struct UnkStruct_02006D98)); - ptr->heapId = heapId; +struct UnkStruct_02006D98 *sub_02006D98(enum HeapID heapID) { + struct UnkStruct_02006D98 *ptr = Heap_Alloc(heapID, sizeof(struct UnkStruct_02006D98)); + ptr->heapID = heapID; ptr->unk2E0 = 0; ptr->unk29C = 0; ptr->unk2A0 = 0x8000; ptr->unk2A4 = 0; ptr->unk2A8 = 0x80; - ptr->unk2AC = AllocFromHeap(heapId, 0x8000); + ptr->unk2AC = Heap_Alloc(heapID, 0x8000); - ptr->unk2B0 = AllocFromHeap(heapId, 0xc0); + ptr->unk2B0 = Heap_Alloc(heapID, 0xc0); MIi_CpuClearFast(0, ptr->unk2B0, 4); - ptr->unk2B4 = AllocFromHeap(heapId, 0xc0); + ptr->unk2B4 = Heap_Alloc(heapID, 0xc0); MIi_CpuClearFast(0, ptr->unk2B4, 4); for (int i = 0; i < 4; i++) { @@ -328,7 +328,7 @@ struct UnkStruct_02006D98 *sub_02006D98(HeapID heapId) { u8 *st8; void *st4 = AllocAndReadWholeNarcMemberByIdPair( - NARC_POKETOOL_POKEGRA_OTHERPOKE, NARC_otherpoke_narc_0211_NCGR, ptr->heapId); + NARC_POKETOOL_POKEGRA_OTHERPOKE, NARC_otherpoke_narc_0211_NCGR, ptr->heapID); NNSG2dCharacterData *stc; NNS_G2dGetUnpackedCharacterData(st4, &stc); @@ -346,7 +346,7 @@ struct UnkStruct_02006D98 *sub_02006D98(HeapID heapId) { } } - FreeToHeap(st4); + Heap_Free(st4); ptr->unk2E1 = 1; ptr->unk2E2 = 1; @@ -496,10 +496,10 @@ void sub_02006ED4(struct UnkStruct_02006D98 *param0) { } void sub_020072E8(struct UnkStruct_02006D98 *param0) { - FreeToHeap(param0->unk2AC); - FreeToHeap(param0->unk2B0); - FreeToHeap(param0->unk2B4); - FreeToHeap(param0); + Heap_Free(param0->unk2AC); + Heap_Free(param0->unk2B0); + Heap_Free(param0->unk2B4); + Heap_Free(param0); } void sub_02007314(struct UnkStruct_02006D98_2 *param0) { @@ -1267,7 +1267,7 @@ void sub_020082A8(struct UnkStruct_02006D98 *param0) { st48 = 1; st4c = AllocAndReadWholeNarcMemberByIdPair((NarcId)param0->unk000[st54].unk04.field_00, param0->unk000[st54].unk04.field_02, - param0->heapId); + param0->heapID); NNS_G2dGetUnpackedCharacterData(st4c, &st58); param0->unk2B8.pixelFmt = st58->pixelFmt; param0->unk2B8.mapingType = st58->mapingType; @@ -1353,7 +1353,7 @@ void sub_020082A8(struct UnkStruct_02006D98 *param0) { } } - FreeToHeap(st4c); + Heap_Free(st4c); } //_020086C2 } @@ -1374,7 +1374,7 @@ void sub_020086F4(struct UnkStruct_02006D98 *param0) { stc = 1; st10 = AllocAndReadWholeNarcMemberByIdPair((NarcId)param0->unk000[st14].unk04.field_00, param0->unk000[st14].unk04.field_04, - param0->heapId); + param0->heapID); NNS_G2dGetUnpackedPaletteData(st10, &st18); param0->unk2D0.fmt = st18->fmt; r1 = st18->pRawData; @@ -1382,18 +1382,18 @@ void sub_020086F4(struct UnkStruct_02006D98 *param0) { param0->unk2B0[st14 * 0x10 + r7] = r1[r7]; param0->unk2B4[st14 * 0x10 + r7] = r1[r7]; } - FreeToHeap(st10); + Heap_Free(st10); if (param0->unk000[st14].unk6C.unk0_0 != 0) { st10 = AllocAndReadWholeNarcMemberByIdPair( - NARC_POKETOOL_POKEGRA_OTHERPOKE, NARC_otherpoke_narc_0212_NCLR, param0->heapId); + NARC_POKETOOL_POKEGRA_OTHERPOKE, NARC_otherpoke_narc_0212_NCLR, param0->heapID); NNS_G2dGetUnpackedPaletteData(st10, &st18); r1 = st18->pRawData; for (r7 = 0; r7 < 0x10; r7++) { param0->unk2B0[(param0->unk000[st14].unk6C.unk0_0 + 3) * 0x10 + r7] = r1[r7]; param0->unk2B4[(param0->unk000[st14].unk6C.unk0_0 + 3) * 0x10 + r7] = r1[r7]; } - FreeToHeap(st10); + Heap_Free(st10); } } //_020087E0 diff --git a/arm9/src/unk_02008AA4.c b/arm9/src/unk_02008AA4.c index ffc3523f3..3cb38ffcc 100644 --- a/arm9/src/unk_02008AA4.c +++ b/arm9/src/unk_02008AA4.c @@ -103,7 +103,7 @@ void sub_02008AA4(struct UnkStruct_0200BB14_sub *param0, } struct UnkStruct_02008AA4_1 *sub_02008BE0(struct UnkStruct_02008AA4_2 *param0, - HeapID heapId, + enum HeapID heapID, struct UnkStruct_02008DEC_1 *param2, struct UnkStruct_02008DEC_1 *param3, struct UnkStruct_02008DEC_1 *param4, @@ -116,8 +116,8 @@ struct UnkStruct_02008AA4_1 *sub_02008BE0(struct UnkStruct_02008AA4_2 *param0, r4++; } - struct UnkStruct_02008AA4_1 *r6 = AllocFromHeap(heapId, sizeof(struct UnkStruct_02008AA4_1)); - r6->unk00 = AllocFromHeap(heapId, r4 * sizeof(struct UnkStruct_0200BB14_sub)); + struct UnkStruct_02008AA4_1 *r6 = Heap_Alloc(heapID, sizeof(struct UnkStruct_02008AA4_1)); + r6->unk00 = Heap_Alloc(heapID, r4 * sizeof(struct UnkStruct_0200BB14_sub)); r6->unk04 = r4; for (int r7 = 0; r7 < r6->unk04; r7++) { @@ -145,9 +145,9 @@ void sub_02008C80(struct UnkStruct_02008AA4_1 *param0) { GF_ASSERT(param0); if (param0->unk00 != NULL) { - FreeToHeap(param0->unk00); + Heap_Free(param0->unk00); } - FreeToHeap(param0); + Heap_Free(param0); } u32 sub_02008C9C(u32 param0, void *param1, u32 param2) { diff --git a/arm9/src/unk_02008DEC.c b/arm9/src/unk_02008DEC.c index bbd8de8a9..f52e024ec 100644 --- a/arm9/src/unk_02008DEC.c +++ b/arm9/src/unk_02008DEC.c @@ -33,10 +33,10 @@ extern u32 sub_0201E258(s32, u32); extern u32 sub_0201E230(s32); extern s32 NNS_G2dGetImagePaletteLocation(u32, u32); -struct UnkStruct_02008DEC_1 *sub_02008DEC(u32 param0, s32 param1, HeapID heapId) { - struct UnkStruct_02008DEC_1 *ptr = AllocFromHeap(heapId, sizeof(struct UnkStruct_02008DEC_1)); - ptr->unk00 = sub_02020C44(param0, heapId); - ptr->unk04 = AllocFromHeap(heapId, param0 * sizeof(struct UnkStruct_02008DEC_sub)); +struct UnkStruct_02008DEC_1 *sub_02008DEC(u32 param0, s32 param1, enum HeapID heapID) { + struct UnkStruct_02008DEC_1 *ptr = Heap_Alloc(heapID, sizeof(struct UnkStruct_02008DEC_1)); + ptr->unk00 = sub_02020C44(param0, heapID); + ptr->unk04 = Heap_Alloc(heapID, param0 * sizeof(struct UnkStruct_02008DEC_sub)); memset(ptr->unk04, 0, param0 * sizeof(struct UnkStruct_02008DEC_sub)); ptr->unk08 = (s32)param0; ptr->unk0C = 0; @@ -55,14 +55,14 @@ void sub_02008E2C(struct UnkStruct_02008DEC_1 *param0) { sub_02020C90(param0->unk00); param0->unk00 = 0; - FreeToHeap(param0->unk04); + Heap_Free(param0->unk04); param0->unk04 = NULL; - FreeToHeap(param0); + Heap_Free(param0); } struct UnkStruct_02008DEC_sub *sub_02008E6C( - struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_2 *param1, s32 param2, HeapID heapId) { + struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_2 *param1, s32 param2, enum HeapID heapID) { GF_ASSERT(param0); GF_ASSERT(param1); GF_ASSERT(param1->unk04 > param2); @@ -76,7 +76,7 @@ struct UnkStruct_02008DEC_sub *sub_02008E6C( GF_ASSERT(sub_0200945C(param0, r6->unk00) == 1); sub_0200994C( - param0, st1c, r6->unk04, r6->unk00, r6->unk44, r6->unk48, param1->unk08, heapId); + param0, st1c, r6->unk04, r6->unk00, r6->unk44, r6->unk48, param1->unk08, heapID); } else { struct UnkStruct_02008DEC_4 *r6 = ¶m1->unk00_4[param2]; GF_ASSERT(sub_0200945C(param0, r6->unk0C) == 1); @@ -90,7 +90,7 @@ struct UnkStruct_02008DEC_sub *sub_02008E6C( r6->unk10, r6->unk14, param1->unk08, - heapId, + heapID, FALSE); } @@ -105,14 +105,14 @@ struct UnkStruct_02008DEC_sub *sub_02008F34(struct UnkStruct_02008DEC_1 *param0, BOOL param3, s32 param4, u32 param5, - HeapID heapId) { + enum HeapID heapID) { GF_ASSERT(param0); GF_ASSERT(param0->unk10 == 0); struct UnkStruct_02008DEC_sub *r6 = sub_020097D0(param0); GF_ASSERT(r6); - sub_02009978(param0, r6, param1, param2, param3, param4, param5, 0, 0, heapId, FALSE); + sub_02009978(param0, r6, param1, param2, param3, param4, param5, 0, 0, heapID, FALSE); param0->unk0C++; return r6; @@ -124,7 +124,7 @@ struct UnkStruct_02008DEC_sub *sub_02008F90(struct UnkStruct_02008DEC_1 *param0, BOOL param3, s32 param4, u32 param5, - HeapID heapId, + enum HeapID heapID, BOOL param7) { GF_ASSERT(param0); GF_ASSERT(param0->unk10 == 0); @@ -132,7 +132,7 @@ struct UnkStruct_02008DEC_sub *sub_02008F90(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_sub *r6 = sub_020097D0(param0); GF_ASSERT(r6); - sub_02009978(param0, r6, param1, param2, param3, param4, param5, 0, 0, heapId, param7); + sub_02009978(param0, r6, param1, param2, param3, param4, param5, 0, 0, heapID, param7); param0->unk0C++; return r6; @@ -145,14 +145,14 @@ struct UnkStruct_02008DEC_sub *sub_02008FEC(struct UnkStruct_02008DEC_1 *param0, s32 param4, u32 param5, u32 param6, - HeapID heapId) { + enum HeapID heapID) { GF_ASSERT(param0); GF_ASSERT(param0->unk10 == 1); struct UnkStruct_02008DEC_sub *r6 = sub_020097D0(param0); GF_ASSERT(r6); - sub_02009978(param0, r6, param1, param2, param3, param4, param5, param6, 1, heapId, FALSE); + sub_02009978(param0, r6, param1, param2, param3, param4, param5, param6, 1, heapID, FALSE); param0->unk0C++; return r6; @@ -165,7 +165,7 @@ struct UnkStruct_02008DEC_sub *sub_0200904C(struct UnkStruct_02008DEC_1 *param0, s32 param4, u32 param5, u32 param6, - HeapID heapId, + enum HeapID heapID, BOOL param8) { GF_ASSERT(param0); GF_ASSERT(param0->unk10 == 1); @@ -173,7 +173,7 @@ struct UnkStruct_02008DEC_sub *sub_0200904C(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_sub *r6 = sub_020097D0(param0); GF_ASSERT(r6); - sub_02009978(param0, r6, param1, param2, param3, param4, param5, param6, 1, heapId, param8); + sub_02009978(param0, r6, param1, param2, param3, param4, param5, param6, 1, heapID, param8); param0->unk0C++; return r6; @@ -185,13 +185,13 @@ struct UnkStruct_02008DEC_sub *sub_020090AC(struct UnkStruct_02008DEC_1 *param0, BOOL param3, s32 param4, u32 param5, - HeapID heapId) { + enum HeapID heapID) { GF_ASSERT(param0); struct UnkStruct_02008DEC_sub *r6 = sub_020097D0(param0); GF_ASSERT(r6); - sub_02009978(param0, r6, param1, param2, param3, param4, 0, 0, param5, heapId, FALSE); + sub_02009978(param0, r6, param1, param2, param3, param4, 0, 0, param5, heapID, FALSE); param0->unk0C++; return r6; @@ -202,7 +202,7 @@ void sub_020090FC(struct UnkStruct_02008DEC_1 *param0, NarcId param2, s32 param3, BOOL param4, - HeapID heapId) { + enum HeapID heapID) { GF_ASSERT(param0); GF_ASSERT(param0->unk10 == 0); GF_ASSERT(param1); @@ -212,7 +212,7 @@ void sub_020090FC(struct UnkStruct_02008DEC_1 *param0, u32 r7 = sub_020095E4(param1); sub_02009490(param0, param1); - sub_02009978(param0, param1, param2, param3, param4, r6, r7, 0, 0, heapId, FALSE); + sub_02009978(param0, param1, param2, param3, param4, r6, r7, 0, 0, heapID, FALSE); } void sub_02009168(struct UnkStruct_02008DEC_1 *param0, @@ -220,7 +220,7 @@ void sub_02009168(struct UnkStruct_02008DEC_1 *param0, NarcId param2, s32 param3, BOOL param4, - HeapID heapId) { + enum HeapID heapID) { GF_ASSERT(param0); GF_ASSERT(param0->unk10 == 1); GF_ASSERT(param1); @@ -231,7 +231,7 @@ void sub_02009168(struct UnkStruct_02008DEC_1 *param0, u32 st24 = sub_02009610(param1); sub_02009490(param0, param1); - sub_02009978(param0, param1, param2, param3, param4, r6, r7, st24, 1, heapId, 0); + sub_02009978(param0, param1, param2, param3, param4, r6, r7, st24, 1, heapID, 0); } struct UnkStruct_02008DEC_sub *sub_020091E0(struct UnkStruct_02008DEC_1 *param0, @@ -240,14 +240,14 @@ struct UnkStruct_02008DEC_sub *sub_020091E0(struct UnkStruct_02008DEC_1 *param0, u32 param3, s32 param4, u32 param5, - HeapID heapId) { + enum HeapID heapID) { GF_ASSERT(param0); GF_ASSERT(param0->unk10 == 0); struct UnkStruct_02008DEC_sub *r6 = sub_020097D0(param0); GF_ASSERT(r6); - sub_020099B0(param0, r6, param1, param2, param3, param4, param5, 0, 0, heapId, 0); + sub_020099B0(param0, r6, param1, param2, param3, param4, param5, 0, 0, heapID, 0); param0->unk0C++; return r6; @@ -259,7 +259,7 @@ struct UnkStruct_02008DEC_sub *sub_0200923C(struct UnkStruct_02008DEC_1 *param0, u32 param3, s32 param4, u32 param5, - HeapID heapId, + enum HeapID heapID, u32 param7) { GF_ASSERT(param0); GF_ASSERT(param0->unk10 == 0); @@ -267,7 +267,7 @@ struct UnkStruct_02008DEC_sub *sub_0200923C(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_sub *r6 = sub_020097D0(param0); GF_ASSERT(r6); - sub_020099B0(param0, r6, param1, param2, param3, param4, param5, 0, 0, heapId, param7); + sub_020099B0(param0, r6, param1, param2, param3, param4, param5, 0, 0, heapID, param7); param0->unk0C++; return r6; @@ -280,14 +280,14 @@ struct UnkStruct_02008DEC_sub *sub_02009298(struct UnkStruct_02008DEC_1 *param0, s32 param4, u32 param5, u32 param6, - HeapID heapId) { + enum HeapID heapID) { GF_ASSERT(param0); GF_ASSERT(param0->unk10 == 1); struct UnkStruct_02008DEC_sub *r6 = sub_020097D0(param0); GF_ASSERT(r6); - sub_020099B0(param0, r6, param1, param2, param3, param4, param5, param6, 1, heapId, 0); + sub_020099B0(param0, r6, param1, param2, param3, param4, param5, param6, 1, heapID, 0); param0->unk0C++; return r6; @@ -300,7 +300,7 @@ struct UnkStruct_02008DEC_sub *sub_020092F8(struct UnkStruct_02008DEC_1 *param0, s32 param4, u32 param5, u32 param6, - HeapID heapId, + enum HeapID heapID, u32 param8) { GF_ASSERT(param0); GF_ASSERT(param0->unk10 == 1); @@ -308,7 +308,7 @@ struct UnkStruct_02008DEC_sub *sub_020092F8(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_sub *r6 = sub_020097D0(param0); GF_ASSERT(r6); - sub_020099B0(param0, r6, param1, param2, param3, param4, param5, param6, 1, heapId, param8); + sub_020099B0(param0, r6, param1, param2, param3, param4, param5, param6, 1, heapID, param8); param0->unk0C++; return r6; @@ -320,24 +320,24 @@ struct UnkStruct_02008DEC_sub *sub_02009358(struct UnkStruct_02008DEC_1 *param0, u32 param3, s32 param4, u32 param5, - HeapID heapId) { + enum HeapID heapID) { GF_ASSERT(param0); struct UnkStruct_02008DEC_sub *r6 = sub_020097D0(param0); GF_ASSERT(r6); - sub_020099B0(param0, r6, param1, param2, param3, param4, 0, 0, param5, heapId, 0); + sub_020099B0(param0, r6, param1, param2, param3, param4, 0, 0, param5, heapID, 0); param0->unk0C++; return r6; } s32 sub_020093A8( - struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_2 *param1, struct UnkStruct_02008DEC_5 *param2, HeapID heapId) { + struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_2 *param1, struct UnkStruct_02008DEC_5 *param2, enum HeapID heapID) { GF_ASSERT(param0); GF_ASSERT(param1); - sub_020093DC(param0, param1, 0, param1->unk04, param2, heapId); + sub_020093DC(param0, param1, 0, param1->unk04, param2, heapID); return param1->unk04; } @@ -347,9 +347,9 @@ void sub_020093DC(struct UnkStruct_02008DEC_1 *param0, s32 param2, s32 param3, struct UnkStruct_02008DEC_5 *param4, - HeapID heapId) { + enum HeapID heapID) { for (int r5 = param2; r5 < param2 + param3; r5++) { - struct UnkStruct_02008DEC_sub *r0 = sub_02008E6C(param0, param1, r5, heapId); + struct UnkStruct_02008DEC_sub *r0 = sub_02008E6C(param0, param1, r5, heapID); if (param4 != NULL && param4->unk04 > param4->unk08) { param4->unk00[param4->unk08] = r0; @@ -358,9 +358,9 @@ void sub_020093DC(struct UnkStruct_02008DEC_1 *param0, } } -struct UnkStruct_02008DEC_5 *sub_02009424(s32 param0, HeapID heapId) { - struct UnkStruct_02008DEC_5 *r4 = AllocFromHeap(heapId, sizeof(struct UnkStruct_02008DEC_5)); - r4->unk00 = AllocFromHeap(heapId, param0 * sizeof(struct UnkStruct_02008DEC_sub *)); +struct UnkStruct_02008DEC_5 *sub_02009424(s32 param0, enum HeapID heapID) { + struct UnkStruct_02008DEC_5 *r4 = Heap_Alloc(heapID, sizeof(struct UnkStruct_02008DEC_5)); + r4->unk00 = Heap_Alloc(heapID, param0 * sizeof(struct UnkStruct_02008DEC_sub *)); r4->unk04 = param0; r4->unk08 = 0; @@ -368,8 +368,8 @@ struct UnkStruct_02008DEC_5 *sub_02009424(s32 param0, HeapID heapId) { } void sub_02009448(struct UnkStruct_02008DEC_5 *param0) { - FreeToHeap(param0->unk00); - FreeToHeap(param0); + Heap_Free(param0->unk00); + Heap_Free(param0); } u32 sub_0200945C(struct UnkStruct_02008DEC_1 *param0, s32 param1) { @@ -500,7 +500,7 @@ struct UnkStruct_02008DEC_2 *sub_02009660(struct UnkStruct_02008DEC_2 *param0, s return ¶m0[param1]; } -void sub_02009668(u32 *param0, struct UnkStruct_02008DEC_2 *param1, HeapID heapId) { +void sub_02009668(u32 *param0, struct UnkStruct_02008DEC_2 *param1, enum HeapID heapID) { GF_ASSERT(param1); param1->unk08 = param0[0]; @@ -509,7 +509,7 @@ void sub_02009668(u32 *param0, struct UnkStruct_02008DEC_2 *param1, HeapID heapI param1->unk04 = sub_020099E8((struct UnkStruct_02008DEC_4 *)(param0 + 1)); if (param1->unk04 > 0) { - param1->unk00_4 = AllocFromHeap(heapId, param1->unk04 * sizeof(struct UnkStruct_02008DEC_4)); + param1->unk00_4 = Heap_Alloc(heapID, param1->unk04 * sizeof(struct UnkStruct_02008DEC_4)); } else { param1->unk00_4 = NULL; } @@ -521,7 +521,7 @@ void sub_02009668(u32 *param0, struct UnkStruct_02008DEC_2 *param1, HeapID heapI void sub_020096B4(struct UnkStruct_02008DEC_2 *param0) { if (param0->unk00_4) { - FreeToHeap(param0->unk00_4); + Heap_Free(param0->unk00_4); } param0->unk00_4 = NULL; param0->unk04 = 0; @@ -603,33 +603,33 @@ struct UnkStruct_02008DEC_sub *sub_020097D0(struct UnkStruct_02008DEC_1 *param0) } void sub_020097FC( - struct UnkStruct_02008DEC_sub *param0, u32 param1, u32 param2, u32 param3, HeapID heapId) { + struct UnkStruct_02008DEC_sub *param0, u32 param1, u32 param2, u32 param3, enum HeapID heapID) { void *r0 = sub_02020E0C(param0->unk00); switch (param1) { case 0: - param0->unk08 = sub_0200986C(r0, param2, heapId); + param0->unk08 = sub_0200986C(r0, param2, heapID); break; case 1: - param0->unk08 = sub_0200988C(r0, param2, param3, heapId); + param0->unk08 = sub_0200988C(r0, param2, param3, heapID); break; case 2: - param0->unk08 = sub_020098B0(r0, heapId); + param0->unk08 = sub_020098B0(r0, heapID); break; case 3: - param0->unk08 = sub_020098CC(r0, heapId); + param0->unk08 = sub_020098CC(r0, heapID); break; case 4: - param0->unk08 = sub_020098E8(r0, heapId); + param0->unk08 = sub_020098E8(r0, heapID); break; case 5: - param0->unk08 = sub_02009904(r0, heapId); + param0->unk08 = sub_02009904(r0, heapID); break; } } -struct CharacterData_02008DEC *sub_0200986C(void *param0, u32 param1, HeapID heapId) { - struct CharacterData_02008DEC *ptr = AllocFromHeap(heapId, sizeof(struct CharacterData_02008DEC)); +struct CharacterData_02008DEC *sub_0200986C(void *param0, u32 param1, enum HeapID heapID) { + struct CharacterData_02008DEC *ptr = Heap_Alloc(heapID, sizeof(struct CharacterData_02008DEC)); NNS_G2dGetUnpackedCharacterData(param0, &ptr->chData); ptr->unk04 = param1; @@ -638,8 +638,8 @@ struct CharacterData_02008DEC *sub_0200986C(void *param0, u32 param1, HeapID hea } struct PaletteData_02008DEC *sub_0200988C( - void *param0, u32 param1, u32 param2, HeapID heapId) { - struct PaletteData_02008DEC *ptr = AllocFromHeap(heapId, sizeof(struct PaletteData_02008DEC)); + void *param0, u32 param1, u32 param2, enum HeapID heapID) { + struct PaletteData_02008DEC *ptr = Heap_Alloc(heapID, sizeof(struct PaletteData_02008DEC)); NNS_G2dGetUnpackedPaletteData(param0, &ptr->plttData); ptr->unk04 = param1; @@ -648,32 +648,32 @@ struct PaletteData_02008DEC *sub_0200988C( return ptr; } -struct CellDataBank_02008DEC *sub_020098B0(void *param0, HeapID heapId) { - struct CellDataBank_02008DEC *ptr = AllocFromHeap(heapId, sizeof(struct CellDataBank_02008DEC)); +struct CellDataBank_02008DEC *sub_020098B0(void *param0, enum HeapID heapID) { + struct CellDataBank_02008DEC *ptr = Heap_Alloc(heapID, sizeof(struct CellDataBank_02008DEC)); NNS_G2dGetUnpackedCellBank(param0, &ptr->cellBank); return ptr; } -struct AnimBank_02008DEC *sub_020098CC(void *param0, HeapID heapId) { - struct AnimBank_02008DEC *ptr = AllocFromHeap(heapId, sizeof(struct AnimBank_02008DEC)); +struct AnimBank_02008DEC *sub_020098CC(void *param0, enum HeapID heapID) { + struct AnimBank_02008DEC *ptr = Heap_Alloc(heapID, sizeof(struct AnimBank_02008DEC)); NNS_G2dGetUnpackedAnimBank(param0, &ptr->bankData); return ptr; } -void *sub_020098E8(void *param0, HeapID heapId) { - void *ptr = AllocFromHeap(heapId, 4); +void *sub_020098E8(void *param0, enum HeapID heapID) { + void *ptr = Heap_Alloc(heapID, 4); NNS_G2dGetUnpackedMultiCellBank(param0, ptr); return ptr; } -void *sub_02009904(void *param0, HeapID heapId) { - void *ptr = AllocFromHeap(heapId, 4); +void *sub_02009904(void *param0, enum HeapID heapID) { + void *ptr = Heap_Alloc(heapID, 4); NNS_G2dGetUnpackedMCAnimBank(param0, ptr); @@ -682,7 +682,7 @@ void *sub_02009904(void *param0, HeapID heapId) { void sub_02009920(struct UnkStruct_02008DEC_sub *param0) { if (param0->unk08 != NULL) { - FreeToHeap(param0->unk08); + Heap_Free(param0->unk08); } param0->unk08 = NULL; @@ -702,10 +702,10 @@ void sub_0200994C(struct UnkStruct_02008DEC_1 *param0, u32 param4, u32 param5, u32 param6, - HeapID heapId) { - param1->unk00 = sub_02020D10(param0->unk00, param2, param3, heapId); + enum HeapID heapID) { + param1->unk00 = sub_02020D10(param0->unk00, param2, param3, heapID); param1->unk04 = param6; - sub_020097FC(param1, param6, param4, param5, heapId); + sub_020097FC(param1, param6, param4, param5, heapID); } void sub_02009978(struct UnkStruct_02008DEC_1 *param0, @@ -717,13 +717,13 @@ void sub_02009978(struct UnkStruct_02008DEC_1 *param0, u32 param6, u32 param7, u32 param8, - HeapID heapId, + enum HeapID heapID, BOOL param10) { - void *r1 = GfGfxLoader_LoadFromNarc(param2, param3, param4, heapId, param10); + void *r1 = GfGfxLoader_LoadFromNarc(param2, param3, param4, heapID, param10); param1->unk00 = sub_02020CD4(param0->unk00, r1, param5); param1->unk04 = param8; - sub_020097FC(param1, param8, param6, param7, heapId); + sub_020097FC(param1, param8, param6, param7, heapID); } void sub_020099B0(struct UnkStruct_02008DEC_1 *param0, @@ -735,12 +735,12 @@ void sub_020099B0(struct UnkStruct_02008DEC_1 *param0, u32 param6, u32 param7, u32 param8, - HeapID heapId, + enum HeapID heapID, u32 param10) { - param1->unk00 = sub_02020CD4(param0->unk00, sub_02009A04(param2, param3, param4, heapId, param10), param5); + param1->unk00 = sub_02020CD4(param0->unk00, sub_02009A04(param2, param3, param4, heapID, param10), param5); param1->unk04 = param8; - sub_020097FC(param1, param8, param6, param7, heapId); + sub_020097FC(param1, param8, param6, param7, heapID); } s32 sub_020099E8(struct UnkStruct_02008DEC_4 *param0) { @@ -752,20 +752,20 @@ s32 sub_020099E8(struct UnkStruct_02008DEC_4 *param0) { return r3; } -void *sub_02009A04(NARC *param0, u32 param1, u32 param2, HeapID heapId, u32 param4) { - void *r4 = NARC_AllocAndReadWholeMember(param0, param1, heapId); +void *sub_02009A04(NARC *param0, u32 param1, u32 param2, enum HeapID heapID, u32 param4) { + void *r4 = NARC_AllocAndReadWholeMember(param0, param1, heapID); if (r4 != NULL && param2 != 0) { void *ptr; if (param4 == 0) { - ptr = AllocFromHeap(heapId, (*(u32 *)r4) >> 8); + ptr = Heap_Alloc(heapID, (*(u32 *)r4) >> 8); } else { - ptr = AllocFromHeapAtEnd(heapId, (*(u32 *)r4) >> 8); + ptr = Heap_AllocAtEnd(heapID, (*(u32 *)r4) >> 8); } if (ptr != NULL) { MI_UncompressLZ8(r4, ptr); - FreeToHeap(r4); + Heap_Free(r4); } r4 = ptr; diff --git a/arm9/src/unk_0200BB14.c b/arm9/src/unk_0200BB14.c index 003f8c93a..fe4e377a5 100644 --- a/arm9/src/unk_0200BB14.c +++ b/arm9/src/unk_0200BB14.c @@ -9,7 +9,7 @@ #include "unk_02008DEC.h" extern void sub_0201D060(u32 *param0, u32 param1, u32 param2); -extern void sub_0201E00C(u32 param0, HeapID heapId); +extern void sub_0201E00C(u32 param0, enum HeapID heapID); extern void NNS_G2dInitOamManagerModule(); extern u32 sub_0201C328(u32 param0, u32 param1); extern void sub_0201D168(); @@ -56,13 +56,13 @@ extern void sub_02020054(u32 param0, u32 *param1); extern void sub_02020358(u32 param0, u32 param1); extern void sub_02020398(u32 param0, u32 param1); -struct UnkStruct_0200BB14_1 *sub_0200BB14(HeapID heapId) { - struct UnkStruct_0200BB14_1 *ptr = AllocFromHeap(heapId, sizeof(struct UnkStruct_0200BB14_1)); +struct UnkStruct_0200BB14_1 *sub_0200BB14(enum HeapID heapID) { + struct UnkStruct_0200BB14_1 *ptr = Heap_Alloc(heapID, sizeof(struct UnkStruct_0200BB14_1)); if (ptr == NULL) { return NULL; } - ptr->heapId = heapId; + ptr->heapID = heapID; ptr->unk004 = 0; ptr->unk008 = 1; @@ -72,7 +72,7 @@ struct UnkStruct_0200BB14_1 *sub_0200BB14(HeapID heapId) { struct UnkStruct_0200BB14_2 *sub_0200BB34(struct UnkStruct_0200BB14_1 *param0) { GF_ASSERT(param0 != NULL); - struct UnkStruct_0200BB14_2 *ptr = AllocFromHeap(param0->heapId, sizeof(struct UnkStruct_0200BB14_2)); + struct UnkStruct_0200BB14_2 *ptr = Heap_Alloc(param0->heapID, sizeof(struct UnkStruct_0200BB14_2)); if (ptr == NULL) { return NULL; } @@ -98,10 +98,10 @@ BOOL sub_0200BB6C( return FALSE; } - u32 st14[4] = { param2[0], param2[1], param2[2], param0->heapId }; + u32 st14[4] = { param2[0], param2[1], param2[2], param0->heapID }; sub_0201D060(st14, param2[3], param2[4]); - sub_0201E00C(param3, param0->heapId); + sub_0201E00C(param3, param0->heapID); NNS_G2dInitOamManagerModule(); if (param0->unk008 == 1) { @@ -113,10 +113,10 @@ BOOL sub_0200BB6C( param1[5], param1[6], param1[7], - param0->heapId); + param0->heapID); } - param0->unk00c = sub_0201C328(0x20, param0->heapId); + param0->unk00c = sub_0201C328(0x20, param0->heapID); sub_0201D168(); sub_0201E0BC(); @@ -129,7 +129,7 @@ BOOL sub_0200BBF0( return FALSE; } - param1->unk00 = sub_02008C9C(param2, param0->unk010, param0->heapId); + param1->unk00 = sub_02008C9C(param2, param0->unk010, param0->heapID); return TRUE; } @@ -167,7 +167,7 @@ void sub_0200BC5C(struct UnkStruct_0200BB14_2 *param0) { sub_020096B4(sub_02009660(param0->unk08, i)); } - FreeToHeap(param0->unk08); + Heap_Free(param0->unk08); sub_02009C30(param0->unk24[0]); sub_02009E28(param0->unk24[1]); @@ -190,7 +190,7 @@ void sub_0200BCB0(u32 *param0) { void sub_0200BCD0( struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1) { param0->unk004--; - FreeToHeap(param1); + Heap_Free(param1); } void sub_0200BCE0( @@ -204,7 +204,7 @@ void sub_0200BCE0( void sub_0200BD04(u32 *param0) { GF_ASSERT(param0[1] == 0); sub_0200BCB0(param0); - FreeToHeap(param0); + Heap_Free(param0); } BOOL sub_0200BD20( @@ -222,38 +222,38 @@ BOOL sub_0200BD20( param1->unk54 = st14; u32 r2 = sub_0200965C(); - param1->unk08 = AllocFromHeap(param0->heapId, r2 * st14); + param1->unk08 = Heap_Alloc(param0->heapID, r2 * st14); for (s32 i = 0; i < st14; i++) { struct UnkStruct_02008DEC_2 *st18 = sub_02009660(param1->unk08, i); - void *st1c = AllocAndReadFile(param0->heapId, st10[i]); + void *st1c = AllocAndReadFile(param0->heapID, st10[i]); - sub_02009668(st1c, st18, param0->heapId); - FreeToHeap(st1c); + sub_02009668(st1c, st18, param0->heapID); + Heap_Free(st1c); } for (s32 i = 0; i < st14; i++) { - param1->unk0c[i] = sub_02008DEC(sub_020096CC(sub_02009660(param1->unk08, i)), i, param0->heapId); + param1->unk0c[i] = sub_02008DEC(sub_020096CC(sub_02009660(param1->unk08, i)), i, param0->heapID); } for (s32 i = 0; i < st14; i++) { struct UnkStruct_02008DEC_2 *st20 = sub_02009660(param1->unk08, i); - param1->unk24[i] = sub_02009424(sub_020096CC(st20), param0->heapId); - param1->unk3c[i] = sub_020093A8(param1->unk0c[i], st20, param1->unk24[i], param0->heapId); + param1->unk24[i] = sub_02009424(sub_020096CC(st20), param0->heapID); + param1->unk3c[i] = sub_020093A8(param1->unk0c[i], st20, param1->unk24[i], param0->heapID); } sub_02009A90(param1->unk24[0]); sub_02009D34(param1->unk24[1]); - struct UnkStruct_02008AA4_2 *r6 = AllocAndReadFile(param0->heapId, st10[6]); + struct UnkStruct_02008AA4_2 *r6 = AllocAndReadFile(param0->heapID, st10[6]); param1->unk04 = sub_02008BE0(r6, - param0->heapId, + param0->heapID, param1->unk0c[0], param1->unk0c[1], param1->unk0c[2], param1->unk0c[3], param1->unk0c[4], param1->unk0c[5]); - FreeToHeap(r6); + Heap_Free(r6); return TRUE; } @@ -359,12 +359,12 @@ BOOL sub_0200BF60( param1->unk54 = st4; for (i = 0; i < st4; i++) { - param1->unk0c[i] = sub_02008DEC(param2[i], i, st0->heapId); + param1->unk0c[i] = sub_02008DEC(param2[i], i, st0->heapID); } for (i = 0; i < st4; i++) { if (param2[i] != 0) { - param1->unk24[i] = sub_02009424(param2[i], st0->heapId); + param1->unk24[i] = sub_02009424(param2[i], st0->heapID); param1->unk3c[i] = 0; for (s32 j = 0; j < param1->unk24[i]->unk04; j++) { @@ -376,7 +376,7 @@ BOOL sub_0200BF60( return TRUE; } -BOOL sub_0200C00C(HeapID *heapId, +BOOL sub_0200C00C(enum HeapID *heapID, struct UnkStruct_0200BB14_2 *param1, NarcId param2, s32 param3, @@ -387,7 +387,7 @@ BOOL sub_0200C00C(HeapID *heapId, return FALSE; } - struct UnkStruct_02008DEC_sub *r5 = sub_02008F34(param1->unk0c[0], param2, param3, param4, param6, param5, *heapId); + struct UnkStruct_02008DEC_sub *r5 = sub_02008F34(param1->unk0c[0], param2, param3, param4, param6, param5, *heapID); if (r5 != NULL) { sub_02009B04(r5); sub_0200C474(param1->unk24[0], r5); @@ -398,7 +398,7 @@ BOOL sub_0200C00C(HeapID *heapId, return r5 != NULL ? TRUE : FALSE; } -s32 sub_0200C06C(HeapID *heapId, +s32 sub_0200C06C(enum HeapID *heapID, struct UnkStruct_0200BB14_2 *param1, NarcId param2, s32 param3, @@ -410,7 +410,7 @@ s32 sub_0200C06C(HeapID *heapId, return -1; } - struct UnkStruct_02008DEC_sub *r5 = sub_02008FEC(param1->unk0c[1], param2, param3, param4, param7, param6, param5, *heapId); + struct UnkStruct_02008DEC_sub *r5 = sub_02008FEC(param1->unk0c[1], param2, param3, param4, param7, param6, param5, *heapID); if (r5 != NULL) { GF_ASSERT(sub_02009D68(r5) == 1); sub_0200C474(param1->unk24[1], r5); @@ -423,7 +423,7 @@ s32 sub_0200C06C(HeapID *heapId, u8 sub_0200C0DC(u32 param0, u32 param1, - HeapID *heapId, + enum HeapID *heapID, struct UnkStruct_0200BB14_2 *param3, NarcId param4, s32 param5, @@ -431,7 +431,7 @@ u8 sub_0200C0DC(u32 param0, u32 param7, u32 param8, s32 param9) { - s32 r4 = sub_0200C06C(heapId, param3, param4, param5, param6, param7, param8, param9); + s32 r4 = sub_0200C06C(heapID, param3, param4, param5, param6, param7, param8, param9); if (r4 != -1) { sub_02003108(param0, param1, (u16)(r4 << 4), param7 << 5); } @@ -439,22 +439,22 @@ u8 sub_0200C0DC(u32 param0, return (u8)r4; } -BOOL sub_0200C124(HeapID *heapId, +BOOL sub_0200C124(enum HeapID *heapID, struct UnkStruct_0200BB14_2 *param1, NarcId param2, s32 param3, BOOL param4, s32 param5) { - return sub_0200C404(heapId, param1, param2, param3, param4, 2, param5); + return sub_0200C404(heapID, param1, param2, param3, param4, 2, param5); } -BOOL sub_0200C13C(HeapID *heapId, +BOOL sub_0200C13C(enum HeapID *heapID, struct UnkStruct_0200BB14_2 *param1, NarcId param2, s32 param3, BOOL param4, s32 param5) { - return sub_0200C404(heapId, param1, param2, param3, param4, 3, param5); + return sub_0200C404(heapID, param1, param2, param3, param4, 3, param5); } struct UnkStruct_0200BB14_5 *sub_0200C154( @@ -462,21 +462,21 @@ struct UnkStruct_0200BB14_5 *sub_0200C154( struct UnkStruct_0200BB14_4 st44; s32 st2c[6]; - struct UnkStruct_0200BB14_5 *ptr = AllocFromHeap(param0->heapId, sizeof(struct UnkStruct_0200BB14_5)); + struct UnkStruct_0200BB14_5 *ptr = Heap_Alloc(param0->heapID, sizeof(struct UnkStruct_0200BB14_5)); if (ptr == NULL) { return NULL; } - ptr->unk08 = AllocFromHeap(param0->heapId, sizeof(struct UnkStruct_0200BB14_6)); + ptr->unk08 = Heap_Alloc(param0->heapID, sizeof(struct UnkStruct_0200BB14_6)); if (ptr->unk08 == 0) { return NULL; } - ptr->unk08->unk0 = AllocFromHeap(param0->heapId, sizeof(struct UnkStruct_0200BB14_sub)); + ptr->unk08->unk0 = Heap_Alloc(param0->heapID, sizeof(struct UnkStruct_0200BB14_sub)); ptr->unk04 = ptr->unk08->unk0; if (ptr->unk08->unk0 == NULL) { if (ptr->unk08 != NULL) { - FreeToHeap(ptr->unk08); + Heap_Free(ptr->unk08); } return NULL; @@ -549,7 +549,7 @@ struct UnkStruct_0200BB14_5 *sub_0200C154( st44.unk20 = 0; st44.unk24 = param2[2]; st44.unk28 = param2[4]; - st44.unk2c = param0->heapId; + st44.unk2c = param0->heapID; ptr->unk00 = sub_0201FE94(&st44); ptr->unk0c = param2[12]; @@ -611,10 +611,10 @@ void sub_0200C3DC(u32 *param0) { sub_0201FFC8(param0[0]); sub_02008C80((struct UnkStruct_02008AA4_1 *)param0[2]); - FreeToHeap(param0); + Heap_Free(param0); } -BOOL sub_0200C404(HeapID *heapId, +BOOL sub_0200C404(enum HeapID *heapID, struct UnkStruct_0200BB14_2 *param1, NarcId param2, s32 param3, @@ -625,7 +625,7 @@ BOOL sub_0200C404(HeapID *heapId, return FALSE; } - struct UnkStruct_02008DEC_sub *r5 = sub_020090AC(param1->unk0c[param5], param2, param3, param4, param6, param5, *heapId); + struct UnkStruct_02008DEC_sub *r5 = sub_020090AC(param1->unk0c[param5], param2, param3, param4, param6, param5, *heapID); if (r5 != NULL) { BOOL r4 = sub_0200C474(param1->unk24[param5], r5); GF_ASSERT(r4 == TRUE); @@ -984,7 +984,7 @@ void sub_0200C90C(u32 *param0, u32 param1) { sub_0200C904(*param0, param1); } -BOOL sub_0200C918(HeapID *heapId, +BOOL sub_0200C918(enum HeapID *heapID, struct UnkStruct_0200BB14_2 *param1, NarcId param2, s32 param3, @@ -995,7 +995,7 @@ BOOL sub_0200C918(HeapID *heapId, return FALSE; } - struct UnkStruct_02008DEC_sub *r5 = sub_02008F34(param1->unk0c[0], param2, param3, param4, param6, param5, *heapId); + struct UnkStruct_02008DEC_sub *r5 = sub_02008F34(param1->unk0c[0], param2, param3, param4, param6, param5, *heapID); if (r5 != NULL) { sub_02009AC4(r5); sub_0200C474(param1->unk24[0], r5); @@ -1007,7 +1007,7 @@ BOOL sub_0200C918(HeapID *heapId, return r5 != NULL ? TRUE : FALSE; } -BOOL sub_0200C978(HeapID *heapId, +BOOL sub_0200C978(enum HeapID *heapID, struct UnkStruct_0200BB14_2 *param1, NarcId param2, s32 param3, @@ -1018,7 +1018,7 @@ BOOL sub_0200C978(HeapID *heapId, return FALSE; } - struct UnkStruct_02008DEC_sub *r5 = sub_02008F34(param1->unk0c[0], param2, param3, param4, param6, param5, *heapId); + struct UnkStruct_02008DEC_sub *r5 = sub_02008F34(param1->unk0c[0], param2, param3, param4, param6, param5, *heapID); if (r5 != NULL) { sub_02009B78(r5); sub_0200C474(param1->unk24[0], r5); @@ -1031,17 +1031,17 @@ BOOL sub_0200C978(HeapID *heapId, } void sub_0200C9D8( - HeapID *heapId, struct UnkStruct_02008DEC_1 **param1, NarcId param2, s32 param3, BOOL param4, s32 param5) { + enum HeapID *heapID, struct UnkStruct_02008DEC_1 **param1, NarcId param2, s32 param3, BOOL param4, s32 param5) { struct UnkStruct_02008DEC_sub *r6 = sub_020094F0(param1[3], param5); - sub_020090FC(param1[3], r6, param2, param3, param4, *heapId); + sub_020090FC(param1[3], r6, param2, param3, param4, *heapID); sub_02009BE8(r6); } void sub_0200CA0C( - HeapID *heapId, struct UnkStruct_02008DEC_1 **param1, NarcId param2, s32 param3, BOOL param4, s32 param5) { + enum HeapID *heapID, struct UnkStruct_02008DEC_1 **param1, NarcId param2, s32 param3, BOOL param4, s32 param5) { struct UnkStruct_02008DEC_sub *r6 = sub_020094F0(param1[4], param5); - sub_02009168(param1[4], r6, param2, param3, param4, *heapId); + sub_02009168(param1[4], r6, param2, param3, param4, *heapID); sub_02009DE0(r6); } diff --git a/arm9/src/unk_02021590.c b/arm9/src/unk_02021590.c index f67514417..25e73bcce 100644 --- a/arm9/src/unk_02021590.c +++ b/arm9/src/unk_02021590.c @@ -12,7 +12,7 @@ static const u8 sGlyphShapes[][2] = { { 2, 3 }, }; -static void (*const sAllocators[])(struct FontData *, HeapID) = { +static void (*const sAllocators[])(struct FontData *, enum HeapID) = { InitFontResources_FromPreloaded, InitFontResources_LazyFromNarc, }; @@ -22,11 +22,11 @@ static void (*const sDestructors[])(struct FontData *) = { FreeLoadedFontResources_LazyFromNarc, }; -struct FontData *FontData_New(NarcId narcId, s32 fileId, u32 unk2, BOOL unk3, HeapID heapId) { - struct FontData *ret = (struct FontData *)AllocFromHeap(heapId, sizeof(struct FontData)); +struct FontData *FontData_New(NarcId narcId, s32 fileId, u32 unk2, BOOL unk3, enum HeapID heapID) { + struct FontData *ret = (struct FontData *)Heap_Alloc(heapID, sizeof(struct FontData)); if (ret != NULL) { - FontData_Init(ret, narcId, fileId, unk3, heapId); - InitFontResources(ret, unk2, heapId); + FontData_Init(ret, narcId, fileId, unk3, heapID); + InitFontResources(ret, unk2, heapID); } return ret; } @@ -34,18 +34,18 @@ struct FontData *FontData_New(NarcId narcId, s32 fileId, u32 unk2, BOOL unk3, He void FontData_Delete(struct FontData *ptr) { FreeLoadedFontResources(ptr); FontData_FreeWidthsAndNarc(ptr); - FreeToHeap(ptr); + Heap_Free(ptr); } -void FontData_ModeSwitch(struct FontData *ptr, u32 a1, HeapID heapId) { +void FontData_ModeSwitch(struct FontData *ptr, u32 a1, enum HeapID heapID) { if (ptr->glyphAccessMode != a1) { FreeLoadedFontResources(ptr); - InitFontResources(ptr, a1, heapId); + InitFontResources(ptr, a1, heapID); } } -void FontData_Init(struct FontData *ptr, NarcId narcId, s32 fileId, BOOL unk, HeapID heapId) { - ptr->narc = NARC_New(narcId, heapId); +void FontData_Init(struct FontData *ptr, NarcId narcId, s32 fileId, BOOL unk, enum HeapID heapID) { + ptr->narc = NARC_New(narcId, heapID); if (ptr->narc != NULL) { NARC_ReadFromMember(ptr->narc, (u32)fileId, 0, 16, &ptr->gfxHeader); ptr->isFixedWidthFont = unk; @@ -54,7 +54,7 @@ void FontData_Init(struct FontData *ptr, NarcId narcId, s32 fileId, BOOL unk, He ptr->glyphWidthFunc = GetGlyphWidth_FixedWidth; } else { GF_ASSERT(ptr->gfxHeader.widthDataStart != 0); - ptr->glyphWidths = AllocFromHeap(heapId, ptr->gfxHeader.numGlyphs); + ptr->glyphWidths = Heap_Alloc(heapID, ptr->gfxHeader.numGlyphs); ptr->glyphWidthFunc = GetGlyphWidth_VariableWidth; NARC_ReadFromMember(ptr->narc, (u32)fileId, ptr->gfxHeader.widthDataStart, ptr->gfxHeader.numGlyphs, ptr->glyphWidths); } @@ -67,27 +67,27 @@ void FontData_Init(struct FontData *ptr, NarcId narcId, s32 fileId, BOOL unk, He void FontData_FreeWidthsAndNarc(struct FontData *ptr) { if (ptr->glyphWidths != NULL) { - FreeToHeap(ptr->glyphWidths); + Heap_Free(ptr->glyphWidths); } if (ptr->narc != NULL) { NARC_Delete(ptr->narc); } } -void InitFontResources(struct FontData *ptr, u32 a1, HeapID heapId) { +void InitFontResources(struct FontData *ptr, u32 a1, enum HeapID heapID) { ptr->glyphAccessMode = a1; - sAllocators[a1](ptr, heapId); + sAllocators[a1](ptr, heapID); } -void InitFontResources_FromPreloaded(struct FontData *ptr, HeapID heapId) { +void InitFontResources_FromPreloaded(struct FontData *ptr, enum HeapID heapID) { u32 r4 = ptr->glyphSize * ptr->gfxHeader.numGlyphs; - ptr->narcReadBuf = AllocFromHeap(heapId, r4); + ptr->narcReadBuf = Heap_Alloc(heapID, r4); ptr->uncompGlyphFunc = DecompressGlyphTiles_FromPreloaded; NARC_ReadFromMember(ptr->narc, ptr->fileId, ptr->gfxHeader.headerSize, r4, ptr->narcReadBuf); } -void InitFontResources_LazyFromNarc(struct FontData *ptr, HeapID heapId) { -#pragma unused(heapId) +void InitFontResources_LazyFromNarc(struct FontData *ptr, enum HeapID heapID) { +#pragma unused(heapID) ptr->uncompGlyphFunc = DecompressGlyphTiles_LazyFromNarc; } @@ -96,7 +96,7 @@ void FreeLoadedFontResources(struct FontData *ptr) { } void FreeLoadedFontResources_FromPreloaded(struct FontData *ptr) { - FreeToHeap(ptr->narcReadBuf); + Heap_Free(ptr->narcReadBuf); ptr->narcReadBuf = NULL; } diff --git a/arm9/src/unk_02021934.c b/arm9/src/unk_02021934.c index 1b99e5381..fa420346e 100644 --- a/arm9/src/unk_02021934.c +++ b/arm9/src/unk_02021934.c @@ -6,8 +6,8 @@ #define ASSERT_STR16(_str) ({ GF_ASSERT(_str != NULL); GF_ASSERT(_str->magic == STR16_MAGIC); }) -struct String *String_New(u32 length, HeapID heapId) { - struct String *ret = AllocFromHeap(heapId, length * 2 + 10); +struct String *String_New(u32 length, enum HeapID heapID) { + struct String *ret = Heap_Alloc(heapID, length * 2 + 10); if (ret != NULL) { ret->magic = STR16_MAGIC; ret->maxsize = (u16)length; @@ -20,7 +20,7 @@ struct String *String_New(u32 length, HeapID heapId) { void String_Delete(struct String *str) { ASSERT_STR16(str); str->magic = STR16_MAGIC | 1; - FreeToHeap(str); + Heap_Free(str); } void String_SetEmpty(struct String *str) { @@ -40,9 +40,9 @@ void StringCopy(struct String *dest, struct String *src) { GF_ASSERT(0); } -struct String *StringDup(struct String *src, HeapID heapId) { +struct String *StringDup(struct String *src, enum HeapID heapID) { ASSERT_STR16(src); - struct String *dest = String_New((u32)(src->size + 1), heapId); + struct String *dest = String_New((u32)(src->size + 1), heapID); if (dest != NULL) { StringCopy(dest, src); } diff --git a/arm9/src/unk_02021FF8.c b/arm9/src/unk_02021FF8.c index b739a4a24..8f79f0ba4 100644 --- a/arm9/src/unk_02021FF8.c +++ b/arm9/src/unk_02021FF8.c @@ -5,23 +5,23 @@ #include "heap.h" #include "string16.h" -struct UnkStruct_020220C4 *sub_020220C4(u8 *a0, u32 a1, void (*a2)(s32, s32, u32), u32 a3, HeapID heapId) { +struct UnkStruct_020220C4 *sub_020220C4(u8 *a0, u32 a1, void (*a2)(s32, s32, u32), u32 a3, enum HeapID heapID) { struct UnkStruct_020220C4 *ret; s32 i; GF_ASSERT(a1 != 0); - ret = AllocFromHeap(heapId, sizeof(struct UnkStruct_020220C4)); + ret = Heap_Alloc(heapID, sizeof(struct UnkStruct_020220C4)); if (ret != NULL) { ret->field_0 = a0; ret->field_4 = a1; ret->field_8 = a2; ret->field_C = a3; - ret->field_10 = AllocFromHeap(heapId, a1 * sizeof(struct UnkStruct_020220C4_sub)); + ret->field_10 = Heap_Alloc(heapID, a1 * sizeof(struct UnkStruct_020220C4_sub)); if (ret->field_10 != NULL) { for (i = 0; i < a1; i++) { sub_02022120(&ret->field_10[i]); } } else { - FreeToHeap(ret); + Heap_Free(ret); ret = NULL; } } @@ -36,8 +36,8 @@ void sub_02022120(struct UnkStruct_020220C4_sub *sub) { void sub_0202212C(struct UnkStruct_020220C4 *unk) { GF_ASSERT(unk != NULL); - FreeToHeap(unk->field_10); - FreeToHeap(unk); + Heap_Free(unk->field_10); + Heap_Free(unk); } extern u16 sub_02020A98(void); diff --git a/arm9/src/unk_02022504.c b/arm9/src/unk_02022504.c index 36e1ec87e..e6c344f3b 100644 --- a/arm9/src/unk_02022504.c +++ b/arm9/src/unk_02022504.c @@ -20,8 +20,8 @@ void *sub_02022528(struct SaveData *save) { return SaveArray_Get(save, 32); } -HallOfFame *LoadHallOfFame(struct SaveData *save, HeapID heapId, int *ret_p) { - return (HallOfFame *)ReadSaveFileFromFlash(save, heapId, 0, ret_p); +HallOfFame *LoadHallOfFame(struct SaveData *save, enum HeapID heapID, int *ret_p) { + return (HallOfFame *)ReadSaveFileFromFlash(save, heapID, 0, ret_p); } s32 SaveHallOfFame(struct SaveData *save, HallOfFame *data) { diff --git a/arm9/src/unk_020254B8.c b/arm9/src/unk_020254B8.c index 38a2b9afc..c509ddd04 100644 --- a/arm9/src/unk_020254B8.c +++ b/arm9/src/unk_020254B8.c @@ -35,7 +35,7 @@ BOOL sub_02025500(struct UnkStruct_020254B8 *a, struct UnkStruct_020254B8 *b) { return !StringNotEqual(a->field_00, b->field_00) && a->field_10 == b->field_10; } -void sub_02025520(struct UnkStruct_020254B8 *sp0, struct UnkStruct_020254B8 *sp4, s32 n, HeapID heapId) { +void sub_02025520(struct UnkStruct_020254B8 *sp0, struct UnkStruct_020254B8 *sp4, s32 n, enum HeapID heapID) { s32 sp18[5]; s32 sp14; struct UnkStruct_020254B8 *sp10; @@ -45,7 +45,7 @@ void sub_02025520(struct UnkStruct_020254B8 *sp0, struct UnkStruct_020254B8 *sp4 s32 r4_2; // auto buffer = new UnkStruct_020254B8[16] - sp10 = AllocFromHeap(heapId, 16 * sizeof(struct UnkStruct_020254B8)); + sp10 = Heap_Alloc(heapID, 16 * sizeof(struct UnkStruct_020254B8)); sub_020254CC(sp10); // Look up each element of sp4 in sp0 @@ -80,7 +80,7 @@ void sub_02025520(struct UnkStruct_020254B8 *sp0, struct UnkStruct_020254B8 *sp4 } // Copy buffer to sp0 and destroy buffer memcpy(sp0, sp10, 16 * sizeof(struct UnkStruct_020254B8)); - FreeToHeap(sp10); + Heap_Free(sp10); } s32 sub_02025614(struct UnkStruct_020254B8 *a0, u32 a1) { diff --git a/arm9/src/unk_0202A1E0.c b/arm9/src/unk_0202A1E0.c index 49e9322fe..48ebb32fe 100644 --- a/arm9/src/unk_0202A1E0.c +++ b/arm9/src/unk_0202A1E0.c @@ -422,8 +422,8 @@ void sub_0202A864(struct SaveStruct23_Substruct4 *substruct4, struct Unk0202A784 dst->u_1 = substruct4->u_102; } -struct SaveStruct23_Substruct4_Substruct2 *sub_0202A878(struct SaveStruct23_Substruct4 *substruct4, HeapID heapId) { - struct SaveStruct23_Substruct4_Substruct2 *substruct4_substruct2 = AllocFromHeap(heapId, sizeof(struct SaveStruct23_Substruct4_Substruct2) /* 1020 */); +struct SaveStruct23_Substruct4_Substruct2 *sub_0202A878(struct SaveStruct23_Substruct4 *substruct4, enum HeapID heapID) { + struct SaveStruct23_Substruct4_Substruct2 *substruct4_substruct2 = Heap_Alloc(heapID, sizeof(struct SaveStruct23_Substruct4_Substruct2) /* 1020 */); MI_CpuCopy8(&substruct4->substruct2, substruct4_substruct2, sizeof(struct SaveStruct23_Substruct4_Substruct2)); return substruct4_substruct2; } diff --git a/arm9/src/unk_0202E29C.c b/arm9/src/unk_0202E29C.c index 64eb0325c..1bb6f43ec 100644 --- a/arm9/src/unk_0202E29C.c +++ b/arm9/src/unk_0202E29C.c @@ -59,13 +59,13 @@ extern BOOL sub_0202D2D0(); void sub_0202E29C(PlayerProfile *player_data) { if (UNK_021C59F0 == NULL) { - UNK_021C59F0 = AllocFromHeap(HEAP_ID_15, sizeof(struct UnkStruct_0202E29C)); + UNK_021C59F0 = Heap_Alloc(HEAP_ID_15, sizeof(struct UnkStruct_0202E29C)); MI_CpuFill8(UNK_021C59F0, 0, sizeof(struct UnkStruct_0202E29C)); - UNK_021C59F0->unkCA4 = AllocFromHeap(HEAP_ID_15, sub_0202CEEC()); + UNK_021C59F0->unkCA4 = Heap_Alloc(HEAP_ID_15, sub_0202CEEC()); MI_CpuFill8(UNK_021C59F0->unkCA4, 0, sub_0202CEEC()); - UNK_021C59F0->unkCBC = AllocFromHeap(HEAP_ID_15, sub_02023AC4()); + UNK_021C59F0->unkCBC = Heap_Alloc(HEAP_ID_15, sub_02023AC4()); MI_CpuFill8(UNK_021C59F0->unkCBC, 0, sub_02023AC4()); UNK_021C59F0->unkCC0 = 0x333; @@ -332,9 +332,9 @@ void sub_0202E7B0(u32 param0) { } void sub_0202E7D8() { - FreeToHeap(UNK_021C59F0->unkCBC); - FreeToHeap(UNK_021C59F0->unkCA4); - FreeToHeap(UNK_021C59F0); + Heap_Free(UNK_021C59F0->unkCBC); + Heap_Free(UNK_021C59F0->unkCA4); + Heap_Free(UNK_021C59F0); UNK_021C59F0 = NULL; } diff --git a/arm9/src/unk_0202F150.c b/arm9/src/unk_0202F150.c index d66e49e06..fa72f4d41 100644 --- a/arm9/src/unk_0202F150.c +++ b/arm9/src/unk_0202F150.c @@ -56,7 +56,7 @@ u32 sub_0202F150(u32 param0, u32 param1) { } sub_02031480(HEAP_ID_15); - struct UnkStruct0202F150 *ptr = (struct UnkStruct0202F150 *)AllocFromHeap(HEAP_ID_15, sizeof(struct UnkStruct0202F150)); + struct UnkStruct0202F150 *ptr = (struct UnkStruct0202F150 *)Heap_Alloc(HEAP_ID_15, sizeof(struct UnkStruct0202F150)); UNK_021C59F8 = ptr; MI_CpuFill8(ptr, 0, 0x68C); @@ -64,13 +64,13 @@ u32 sub_0202F150(u32 param0, u32 param1) { UNK_021C59F8->unk67D = 0; UNK_021C59F8->unk67E = 0x1b; - UNK_021C59F8->unk45C = AllocFromHeap(HEAP_ID_15, UNK_021C59F8->unk658 << 1); + UNK_021C59F8->unk45C = Heap_Alloc(HEAP_ID_15, UNK_021C59F8->unk658 << 1); - UNK_021C59F8->unk460 = AllocFromHeap(HEAP_ID_15, UNK_021C59F8->unk658); + UNK_021C59F8->unk460 = Heap_Alloc(HEAP_ID_15, UNK_021C59F8->unk658); - UNK_021C59F8->unk458 = AllocFromHeap(HEAP_ID_15, res * UNK_021C59F8->unk658); + UNK_021C59F8->unk458 = Heap_Alloc(HEAP_ID_15, res * UNK_021C59F8->unk658); - UNK_021C59F8->unk454 = AllocFromHeap(HEAP_ID_15, res * UNK_021C59F8->unk658); + UNK_021C59F8->unk454 = Heap_Alloc(HEAP_ID_15, res * UNK_021C59F8->unk658); if (sub_02033534() == 0xa) { sub_0202D7D8(UNK_021C59F8->unk54C, 0x64, &UNK_021C59F8->unk464); @@ -411,13 +411,13 @@ void sub_0202FA5C() { SysTask_Destroy(UNK_021C59F8->unk548); UNK_021C59F8->unk548 = 0; - FreeToHeap(UNK_021C59F8->unk45C); - FreeToHeap(UNK_021C59F8->unk460); - FreeToHeap(UNK_021C59F8->unk458); - FreeToHeap(UNK_021C59F8->unk454); + Heap_Free(UNK_021C59F8->unk45C); + Heap_Free(UNK_021C59F8->unk460); + Heap_Free(UNK_021C59F8->unk458); + Heap_Free(UNK_021C59F8->unk454); sub_0202D824(UNK_021C59F8->unk56C); sub_0202D824(UNK_021C59F8->unk54C); - FreeToHeap(UNK_021C59F8); + Heap_Free(UNK_021C59F8); UNK_021C59F8 = NULL; } } diff --git a/arm9/src/unk_02031480.c b/arm9/src/unk_02031480.c index d86a24960..20cc26d80 100644 --- a/arm9/src/unk_02031480.c +++ b/arm9/src/unk_02031480.c @@ -14,9 +14,9 @@ struct UnkStruct_02031480 { static struct UnkStruct_02031480 *UNK_021C59FC; -void sub_02031480(HeapID heapId) { +void sub_02031480(enum HeapID heapID) { if (UNK_021C59FC == NULL) { - UNK_021C59FC = AllocFromHeap(heapId, sizeof(struct UnkStruct_02031480)); + UNK_021C59FC = Heap_Alloc(heapID, sizeof(struct UnkStruct_02031480)); MI_CpuFill8(UNK_021C59FC, 0, sizeof(struct UnkStruct_02031480)); } @@ -29,7 +29,7 @@ void sub_02031480(HeapID heapId) { } void sub_020314D0() { - FreeToHeap(UNK_021C59FC); + Heap_Free(UNK_021C59FC); UNK_021C59FC = NULL; } diff --git a/arm9/src/unk_02031734.c b/arm9/src/unk_02031734.c index 33b311cb8..4395a7c38 100644 --- a/arm9/src/unk_02031734.c +++ b/arm9/src/unk_02031734.c @@ -61,7 +61,7 @@ extern void sub_0200541C(); void sub_02031734(struct SaveData *save, u8 param1) { if (UNK_021C5A00 == NULL) { sub_0202E49C(); - struct UnkStruct_02031734 *ptr = AllocFromHeap(HEAP_ID_15, sizeof(struct UnkStruct_02031734)); + struct UnkStruct_02031734 *ptr = Heap_Alloc(HEAP_ID_15, sizeof(struct UnkStruct_02031734)); UNK_021C5A00 = ptr; MI_CpuFill8(ptr, 0, sizeof(struct UnkStruct_02031734)); @@ -89,18 +89,18 @@ void sub_020317C0() { if (UNK_021C5A00 != NULL) { sub_0202D918(); if (UNK_021C5A00->unk00 != NULL) { - FreeToHeap(UNK_021C5A00->unk00); + Heap_Free(UNK_021C5A00->unk00); } if (UNK_021C5A00->unk3F >= 0x13) { - DestroyHeap(HEAP_ID_49); + Heap_Destroy(HEAP_ID_49); } sub_02033ED0(); sub_0202E4F0(); - FreeToHeap(UNK_021C5A00); - DestroyHeap(HEAP_ID_15); + Heap_Free(UNK_021C5A00); + Heap_Destroy(HEAP_ID_15); UNK_021C5A00 = NULL; } @@ -115,7 +115,7 @@ BOOL sub_02031810() { void sub_02031824(struct SaveData *save) { if (UNK_021C5A00 == NULL) { - CreateHeapAtEnd(3, 0xf, 0xe000); + Heap_CreateAtEnd(HEAP_ID_MAIN, HEAP_ID_15, 0xe000); sub_02031734(save, 0xa); UNK_021C5A00->unk40 = 0; @@ -179,7 +179,7 @@ void sub_02031934() { void sub_02031948(struct SaveData *save, u8 param1, u8 param2, u32 param3) { if (sub_02030F40() == 0) { - CreateHeapAtEnd(3, 0xf, 0x7080); + Heap_CreateAtEnd(HEAP_ID_MAIN, HEAP_ID_15, 0x7080); sub_02031734(save, param1); UNK_021C5A00->unk40 = param2; UNK_021C5A00->unk30 = param3; @@ -189,7 +189,7 @@ void sub_02031948(struct SaveData *save, u8 param1, u8 param2, u32 param3) { void sub_02031990(struct SaveData *save, u8 param1, u8 param2, u32 param3) { if (sub_02030F40() == 0) { - CreateHeapAtEnd(3, 0xf, 0x7080); + Heap_CreateAtEnd(HEAP_ID_MAIN, HEAP_ID_15, 0x7080); sub_02031734(save, param1); UNK_021C5A00->unk40 = param2; UNK_021C5A00->unk30 = param3; @@ -238,7 +238,7 @@ BOOL sub_02031A2C() { void sub_02031A7C(struct SaveData *save) { if (UNK_021C5A00 == NULL) { - if (CreateHeapAtEnd(3, 0xf, 0x7080) == 0) { + if (Heap_CreateAtEnd(HEAP_ID_MAIN, HEAP_ID_15, 0x7080) == 0) { sub_020335E0(); } @@ -346,7 +346,7 @@ void sub_02031C64() { void sub_02031C74(struct SaveData *save, u8 param1) { if (sub_02030F40() == 0) { - CreateHeapAtEnd(3, 0xf, 0x7080); + Heap_CreateAtEnd(HEAP_ID_MAIN, HEAP_ID_15, 0x7080); sub_02031734(save, param1); sub_02031D20(sub_02032E00, 0); } @@ -354,7 +354,7 @@ void sub_02031C74(struct SaveData *save, u8 param1) { void sub_02031CA8(struct SaveData *save, u8 param1) { if (sub_02030F40() == 0) { - CreateHeapAtEnd(3, 0xf, 0x7080); + Heap_CreateAtEnd(HEAP_ID_MAIN, HEAP_ID_15, 0x7080); sub_02031734(save, param1); sub_02031D20(sub_02032E48, 0); } @@ -1140,7 +1140,7 @@ void sub_02032B8C() { void sub_02032BD0(struct SaveData *save) { if (sub_02030F40() == 0) { - CreateHeapAtEnd(3, 0xf, 0x7000); + Heap_CreateAtEnd(HEAP_ID_MAIN, HEAP_ID_15, 0x7000); sub_02031734(save, 0xe); UNK_021C5A00->unk40 = 0; sub_02031D20(sub_02032B8C, 0); @@ -1212,7 +1212,7 @@ void sub_02032CF4() { void sub_02032D44(struct SaveData *save) { if (sub_02030F40() == 0) { - CreateHeapAtEnd(3, 0xf, 0x7000); + Heap_CreateAtEnd(HEAP_ID_MAIN, HEAP_ID_15, 0x7000); sub_02031734(save, 0x11); UNK_021C5A00->unk40 = 0; sub_02031D20(sub_02032CF4, 0); @@ -1520,8 +1520,8 @@ u32 sub_02033250() { void sub_02033288(struct SaveData *save) { if (UNK_021C5A00 == NULL) { - CreateHeapAtEnd(3, 0xf, 0x100); - UNK_021C5A00 = (struct UnkStruct_02031734 *)AllocFromHeap(HEAP_ID_15, sizeof(struct UnkStruct_02031734)); + Heap_CreateAtEnd(HEAP_ID_MAIN, HEAP_ID_15, 0x100); + UNK_021C5A00 = (struct UnkStruct_02031734 *)Heap_Alloc(HEAP_ID_15, sizeof(struct UnkStruct_02031734)); MI_CpuFill8(UNK_021C5A00, 0, sizeof(struct UnkStruct_02031734)); UNK_021C5A00->unk3F = 0x18; @@ -1536,16 +1536,16 @@ void sub_020332DC() { if (UNK_021C5A00 != 0) { ClearSoftResetDisableMask(1); sub_020334E8(0, 0); - FreeToHeap(UNK_021C5A00); + Heap_Free(UNK_021C5A00); UNK_021C5A00 = NULL; - DestroyHeap(HEAP_ID_15); + Heap_Destroy(HEAP_ID_15); } } void sub_02033310(struct SaveData *save) { if (UNK_021C5A00 == NULL) { - CreateHeapAtEnd(3, HEAP_ID_15, 0x100); - UNK_021C5A00 = (struct UnkStruct_02031734 *)AllocFromHeap(HEAP_ID_15, sizeof(struct UnkStruct_02031734)); + Heap_CreateAtEnd(HEAP_ID_MAIN, HEAP_ID_15, 0x100); + UNK_021C5A00 = (struct UnkStruct_02031734 *)Heap_Alloc(HEAP_ID_15, sizeof(struct UnkStruct_02031734)); MI_CpuFill8(UNK_021C5A00, 0, sizeof(struct UnkStruct_02031734)); UNK_021C5A00->unk3F = 0x19; UNK_021C5A00->unk46 = 1; @@ -1559,9 +1559,9 @@ void sub_02033364() { if (UNK_021C5A00 != 0) { ClearSoftResetDisableMask(1); sub_020334E8(0, 0); - FreeToHeap(UNK_021C5A00); + Heap_Free(UNK_021C5A00); UNK_021C5A00 = NULL; - DestroyHeap(HEAP_ID_15); + Heap_Destroy(HEAP_ID_15); } } @@ -1599,7 +1599,7 @@ void sub_020333F0() { void sub_0203341C() { if (sub_0202E4C8()) { - CreateHeapAtEnd(3, 0x31, 0x31000); + Heap_CreateAtEnd(HEAP_ID_MAIN, HEAP_ID_49, 0x31000); if (sub_0202F918(1, 1, 0x200, 1) != 0) { ov05_021D74E0(UNK_021C5A00->unk28, 0x31); ov04_021D83A8(sub_020335D0); @@ -1616,9 +1616,9 @@ void *sub_0203346C(struct SaveData *save, u32 param1) { } SetSoftResetDisableMask(1); - CreateHeapAtEnd(3, 0xf, 0x7080); + Heap_CreateAtEnd(HEAP_ID_MAIN, HEAP_ID_15, 0x7080); sub_02031734(save, 0x17); - UNK_021C5A00->unk00 = AllocFromHeap(HEAP_ID_15, param1); + UNK_021C5A00->unk00 = Heap_Alloc(HEAP_ID_15, param1); MI_CpuFill8(UNK_021C5A00->unk00, 0, param1); UNK_021C5A00->unk40 = 0; diff --git a/arm9/src/unk_020337E8.c b/arm9/src/unk_020337E8.c index f018302b2..cc0602030 100644 --- a/arm9/src/unk_020337E8.c +++ b/arm9/src/unk_020337E8.c @@ -19,10 +19,10 @@ extern BOOL DWC_CheckValidConsole(struct DWC_Struct *); extern BOOL DWC_CheckUserData(struct DWC_Struct *); extern s32 DWC_GetGsProfileId(struct DWC_Struct *, struct DWC_token *); -s32 sub_020337E8(HeapID heapId) { - s32 ret = (s32)AllocFromHeap(heapId, 0x720); +s32 sub_020337E8(enum HeapID heapID) { + s32 ret = (s32)Heap_Alloc(heapID, 0x720); s32 ret1 = DWC_Init((ret + 0x1F) & ~0x1F); - FreeToHeap((void *)ret); + Heap_Free((void *)ret); return ret1; } diff --git a/arm9/src/unk_0204AEA8.c b/arm9/src/unk_0204AEA8.c index d7c9f256d..4a4a4abba 100644 --- a/arm9/src/unk_0204AEA8.c +++ b/arm9/src/unk_0204AEA8.c @@ -20,7 +20,7 @@ BOOL sub_0204AEA8(struct TaskManager *taskManager) { break; case 1: if (v1[1] == 1) { - FreeToHeap(v1); + Heap_Free(v1); return TRUE; } break; @@ -31,7 +31,7 @@ BOOL sub_0204AEA8(struct TaskManager *taskManager) { void sub_0204AEF8(struct TaskManager *taskManager, u32 a1, u32 a2) // taskManager, effect, bgm { - u32 *v0 = AllocFromHeapAtEnd(HEAP_ID_FIELD, 4 * sizeof(u32)); // todo: make a struct + u32 *v0 = Heap_AllocAtEnd(HEAP_ID_FIELD, 4 * sizeof(u32)); // todo: make a struct v0[0] = 0; // state v0[1] = 0; // unk diff --git a/arm9/src/unk_0204AF24.c b/arm9/src/unk_0204AF24.c index 7604fded3..c2a7bd3a6 100644 --- a/arm9/src/unk_0204AF24.c +++ b/arm9/src/unk_0204AF24.c @@ -8,7 +8,7 @@ extern void sub_02037394(struct FieldSystem *); extern u32 IsPaletteFadeFinished(void); -extern void BeginNormalPaletteFade(u32 pattern, u32 typeTop, u32 typeBottom, u16 colour, u32 duration, u32 framesPer, HeapID heapId); +extern void BeginNormalPaletteFade(u32 pattern, u32 typeTop, u32 typeBottom, u16 colour, u32 duration, u32 framesPer, enum HeapID heapID); extern void ov05_021E331C(struct FieldSystem *); BOOL sub_0204AF24(struct TaskManager *taskManager) { diff --git a/arm9/src/unk_0205FA2C.c b/arm9/src/unk_0205FA2C.c index 636f80037..7e13c4194 100644 --- a/arm9/src/unk_0205FA2C.c +++ b/arm9/src/unk_0205FA2C.c @@ -33,9 +33,9 @@ const u8 UNK_020F7454[] = { }; u32 sub_0205FA2C( - struct UnkCallbackStruct1_0205FA2C *param0, struct FieldSystem *fieldSystem, HeapID heapId) { - struct UnkPlayerStruct1_0205FA2C *ptr = (struct UnkPlayerStruct1_0205FA2C *)AllocFromHeapAtEnd( - heapId, sizeof(struct UnkPlayerStruct1_0205FA2C)); + struct UnkCallbackStruct1_0205FA2C *param0, struct FieldSystem *fieldSystem, enum HeapID heapID) { + struct UnkPlayerStruct1_0205FA2C *ptr = (struct UnkPlayerStruct1_0205FA2C *)Heap_AllocAtEnd( + heapID, sizeof(struct UnkPlayerStruct1_0205FA2C)); struct SaveData *save = fieldSystem->saveData; MI_CpuFill8(ptr, 0, sizeof(struct UnkPlayerStruct1_0205FA2C)); @@ -86,7 +86,7 @@ u32 sub_0205FAD8( MI_CpuCopy8(ptr->unk2c, param0->unk0e, 6); param0->unk0d = ptr->unk22; - FreeToHeap(ptr); + Heap_Free(ptr); *param0->unk14 = NULL; @@ -94,11 +94,11 @@ u32 sub_0205FAD8( } u32 sub_0205FB34( - struct UnkCallbackStruct1_0205FA2C *param0, struct FieldSystem *fieldSystem, HeapID heapId) { + struct UnkCallbackStruct1_0205FA2C *param0, struct FieldSystem *fieldSystem, enum HeapID heapID) { struct SaveData *save = fieldSystem->saveData; - struct UnkPlayerStruct2_0205FA2C *ptr = (struct UnkPlayerStruct2_0205FA2C *)AllocFromHeapAtEnd( - heapId, sizeof(struct UnkPlayerStruct2_0205FA2C)); + struct UnkPlayerStruct2_0205FA2C *ptr = (struct UnkPlayerStruct2_0205FA2C *)Heap_AllocAtEnd( + heapID, sizeof(struct UnkPlayerStruct2_0205FA2C)); MI_CpuFill8(ptr, 0, sizeof(struct UnkPlayerStruct2_0205FA2C)); ptr->options = Save_PlayerData_GetOptionsAddr(save); @@ -135,7 +135,7 @@ u32 sub_0205FBC0( struct UnkPlayerStruct2_0205FA2C *ptr = (struct UnkPlayerStruct2_0205FA2C *)*param0->unk14; param0->unk0d = ptr->unk14; - FreeToHeap(ptr); + Heap_Free(ptr); *param0->unk14 = NULL; @@ -159,7 +159,7 @@ BOOL sub_0205FBE8(struct TaskManager *taskManager) { res2->unk04 = sub_0205FBC0(res2, fieldSystem); break; case 4: - FreeToHeap(res2); + Heap_Free(res2); return TRUE; } @@ -176,7 +176,7 @@ void sub_0205FC50(struct TaskManager *taskManager, u8 param7) { struct FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - struct UnkCallbackStruct1_0205FA2C *ptr = (struct UnkCallbackStruct1_0205FA2C *)AllocFromHeap( + struct UnkCallbackStruct1_0205FA2C *ptr = (struct UnkCallbackStruct1_0205FA2C *)Heap_Alloc( HEAP_ID_FIELD, sizeof(struct UnkCallbackStruct1_0205FA2C)); MI_CpuFill8(ptr, 0, sizeof(struct UnkCallbackStruct1_0205FA2C)); @@ -210,7 +210,7 @@ u32 sub_0205FCC4( } param0->unk00 = param0->unk08[8]; - FreeToHeap(param0->unk08); + Heap_Free(param0->unk08); return 2; } @@ -229,7 +229,7 @@ BOOL sub_0205FCE8(struct TaskManager *taskManager) { case 2: u16 *var = GetVarPointer(fieldSystem, res2->unk10); *var = (u16)res2->unk00; - FreeToHeap(res2); + Heap_Free(res2); return TRUE; } @@ -239,7 +239,7 @@ BOOL sub_0205FCE8(struct TaskManager *taskManager) { void sub_0205FD38(struct TaskManager *taskManager, u16 param1, u16 param2, u16 param3) { struct FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - struct UnkCallbackStruct2_0205FA2C *ptr = (struct UnkCallbackStruct2_0205FA2C *)AllocFromHeap( + struct UnkCallbackStruct2_0205FA2C *ptr = (struct UnkCallbackStruct2_0205FA2C *)Heap_Alloc( HEAP_ID_FIELD, sizeof(struct UnkCallbackStruct2_0205FA2C)); MI_CpuFill8(ptr, 0, sizeof(struct UnkCallbackStruct2_0205FA2C)); @@ -271,7 +271,7 @@ BOOL sub_0205FD70(struct TaskManager *taskManager) { break; } - FreeToHeap(res2); + Heap_Free(res2); return TRUE; } @@ -279,7 +279,7 @@ BOOL sub_0205FD70(struct TaskManager *taskManager) { void sub_0205FDDC(struct TaskManager *taskManager, u16 param1, u16 param2) { struct FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - u16 *ptr = AllocFromHeap(HEAP_ID_FIELD, 2 * sizeof(u16)); + u16 *ptr = Heap_Alloc(HEAP_ID_FIELD, 2 * sizeof(u16)); MI_CpuFill8(ptr, 0, 2 * sizeof(u16)); ptr[0] = param1; diff --git a/arm9/src/unk_0206015C.c b/arm9/src/unk_0206015C.c index f4282629a..0bf39c07e 100644 --- a/arm9/src/unk_0206015C.c +++ b/arm9/src/unk_0206015C.c @@ -15,7 +15,7 @@ in the return type / parameters. They are right for this code but they might not be for every code, please do not blindly trust these prototypes if you are decompiling these functions. */ -extern u32 ov06_02244DB0(HeapID); +extern u32 ov06_02244DB0(enum HeapID); extern void ov06_02244DBC(void *); extern void ov06_02244DC4(void *, void *); extern void ov06_02244EF8(void *); @@ -23,7 +23,7 @@ extern void ov06_02244F18(void *); extern BOOL ov06_02244F24(void *); extern void ov06_02244F2C(void *); extern void *ov06_02245088(struct FieldSystem *fieldSystem); -extern u32 ov06_02245114(HeapID, struct FieldSystem *); +extern u32 ov06_02245114(enum HeapID, struct FieldSystem *); extern void ov06_02245190(u32); extern void ov06_02245198(u8, u32); extern u32 ov06_022451F0(u32); @@ -35,7 +35,7 @@ extern void sub_0205F1D4(struct SaveVarsFlags *); extern void sub_0206367C(struct FieldSystem *, u32); void CallTask_UseGreatMarshBinoculars(struct FieldSystem *fieldSystem) { - struct UnkStruct_0206015C *unkStruct = AllocFromHeapAtEnd(HEAP_ID_FIELD, 0x10); + struct UnkStruct_0206015C *unkStruct = Heap_AllocAtEnd(HEAP_ID_FIELD, 0x10); unkStruct->unk0 = ov06_02244DB0(HEAP_ID_FIELD); unkStruct->unk4 = ov06_02245114(HEAP_ID_FIELD, fieldSystem); unkStruct->unkC = 0; @@ -128,7 +128,7 @@ BOOL Task_UseGreatMarshBinoculars(struct TaskManager *taskManager) { sub_0206367C(fieldSystem, 0); ov06_02245190(unkStruct1->unk4); ov06_02244DBC(unkStruct1->unk0); - FreeToHeap(unkStruct1); + Heap_Free(unkStruct1); return TRUE; default: diff --git a/arm9/src/unk_02064E4C.c b/arm9/src/unk_02064E4C.c index 4d8932a86..ca2b40750 100644 --- a/arm9/src/unk_02064E4C.c +++ b/arm9/src/unk_02064E4C.c @@ -13,8 +13,8 @@ void sub_02064E4C(struct MsgData *msgData, u16 map_sec, struct String *dest) { sub_02002E14(0, dest, 0); } -void sub_02064E60(u32 map_no, HeapID heapId, struct String *dest) { - struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0382_bin, heapId); +void sub_02064E60(u32 map_no, enum HeapID heapID, struct String *dest) { + struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0382_bin, heapID); u16 map_sec = MapHeader_GetMapSec(map_no); sub_02064E4C(msgData, map_sec, dest); diff --git a/arm9/src/unk_020851B8.c b/arm9/src/unk_020851B8.c index 569affc8e..40d348c1e 100644 --- a/arm9/src/unk_020851B8.c +++ b/arm9/src/unk_020851B8.c @@ -6,8 +6,8 @@ #include "heap.h" -struct UnkStruct_020851B8 *sub_020851B8(u8 heapId) { - struct UnkStruct_020851B8 *ptr = AllocFromHeap((HeapID)heapId, sizeof(struct UnkStruct_020851B8)); +struct UnkStruct_020851B8 *sub_020851B8(u8 heapID) { + struct UnkStruct_020851B8 *ptr = Heap_Alloc((enum HeapID)heapID, sizeof(struct UnkStruct_020851B8)); memset(ptr, 0, sizeof(struct UnkStruct_020851B8)); return ptr; } diff --git a/arm9/src/unk_02085338.c b/arm9/src/unk_02085338.c index 86c7bdd8c..1906f770e 100644 --- a/arm9/src/unk_02085338.c +++ b/arm9/src/unk_02085338.c @@ -7,8 +7,8 @@ extern BOOL sub_0205ED0C(struct SaveVarsFlags *state); -struct UnkStruct_02085338 *sub_02085338(u8 r5, u8 r7, struct SaveData *save, HeapID heapId) { - struct UnkStruct_02085338 *ret = (struct UnkStruct_02085338 *)AllocFromHeap(heapId, sizeof(struct UnkStruct_02085338)); +struct UnkStruct_02085338 *sub_02085338(u8 r5, u8 r7, struct SaveData *save, enum HeapID heapID) { + struct UnkStruct_02085338 *ret = (struct UnkStruct_02085338 *)Heap_Alloc(heapID, sizeof(struct UnkStruct_02085338)); ret->unk_00 = r5; ret->unk_01 = r7; ret->unk_0c = Save_Pokedex_Get(save); @@ -29,7 +29,7 @@ struct UnkStruct_02085338 *sub_02085338(u8 r5, u8 r7, struct SaveData *save, Hea } void sub_020853A8(struct UnkStruct_02085338 *ptr) { - FreeToHeap(ptr); + Heap_Free(ptr); } void sub_020853B0(struct UnkStruct_02085338 *ptr, u16 a1) { diff --git a/arm9/src/unk_0208890C.c b/arm9/src/unk_0208890C.c index 331d34f48..48e237f36 100644 --- a/arm9/src/unk_0208890C.c +++ b/arm9/src/unk_0208890C.c @@ -23,8 +23,8 @@ const struct OverlayManagerTemplate UNK_020FD6E4 = { SDK_OVERLAY_INVALID_ID, }; -struct PoffinCaseAppData *sub_0208890C(u32 a0, struct SaveData *save, HeapID heapId, u32 *a3) { - struct PoffinCaseAppData *ret = AllocFromHeap(heapId, sizeof(struct PoffinCaseAppData)); +struct PoffinCaseAppData *sub_0208890C(u32 a0, struct SaveData *save, enum HeapID heapID, u32 *a3) { + struct PoffinCaseAppData *ret = Heap_Alloc(heapID, sizeof(struct PoffinCaseAppData)); MI_CpuFill8(ret, 0, sizeof(struct PoffinCaseAppData)); ret->save = save; @@ -42,9 +42,9 @@ void sub_02088950(struct FieldSystem *fieldSystem, struct PoffinCaseAppData *par sub_020373D4(fieldSystem, (struct OverlayManagerTemplate *)&UNK_020FD6E4, param1); } -struct PoffinCaseAppData *sub_02088960(struct FieldSystem *fieldSystem, u32 a1, HeapID heapId) { +struct PoffinCaseAppData *sub_02088960(struct FieldSystem *fieldSystem, u32 a1, enum HeapID heapID) { struct SaveData *save = FieldSystem_GetSaveData(fieldSystem); - struct PoffinCaseAppData *ret = sub_0208890C(a1, save, heapId, fieldSystem->unk98); + struct PoffinCaseAppData *ret = sub_0208890C(a1, save, heapID, fieldSystem->unk98); sub_02088950(fieldSystem, ret); diff --git a/arm9/src/unk_02088AAC.c b/arm9/src/unk_02088AAC.c index a6fb7d660..49932ba3b 100644 --- a/arm9/src/unk_02088AAC.c +++ b/arm9/src/unk_02088AAC.c @@ -50,7 +50,7 @@ u32 sub_02088AFC(struct UnkStruct_02088AAC *r0) { .exitFunc = ov73_021D7640, .ovly = FS_OVERLAY_ID(OVERLAY_73) }; - r0->ovly_data = OverlayManager_New(&OVERLAY_73_MANAGER, (s32 *)r0, r0->heapId); + r0->ovly_data = OverlayManager_New(&OVERLAY_73_MANAGER, (s32 *)r0, r0->heapID); return 2; } @@ -81,11 +81,11 @@ u32 sub_02088B4C(struct UnkStruct_02088AAC *r0) { .exitFunc = ov75_021E6F00, .ovly = FS_OVERLAY_ID(OVERLAY_75) }; - struct BagView *bag_view = Bag_CreateView(r0->poffinCaseAppData->bag, UNK_020FD6F4, r0->heapId); + struct BagView *bag_view = Bag_CreateView(r0->poffinCaseAppData->bag, UNK_020FD6F4, r0->heapID); sub_0206E314(bag_view, r0->poffinCaseAppData->save, (u8)((u8)r0->unk06 == 1 ? 5 : 4), r0->unk0C); - r0->ovly_data = OverlayManager_New(&OVERLAY_75_MANAGER, (s32 *)bag_view, r0->heapId); + r0->ovly_data = OverlayManager_New(&OVERLAY_75_MANAGER, (s32 *)bag_view, r0->heapID); r0->ovly_param = bag_view; return 1; @@ -96,15 +96,15 @@ u32 sub_02088BA8(struct UnkStruct_02088AAC *r0) { return 1; } - struct BagView *bag_view = BagView_New((u8)r0->heapId); + struct BagView *bag_view = BagView_New((u8)r0->heapID); memcpy(bag_view, r0->ovly_param, BagView_sizeof()); - FreeToHeap(r0->ovly_param); + Heap_Free(r0->ovly_param); r0->ovly_param = NULL; r0->item = sub_0206E37C(bag_view); - FreeToHeap(bag_view); + Heap_Free(bag_view); switch (sub_0206E384(bag_view)) { case 1: @@ -118,7 +118,7 @@ u32 sub_02088BA8(struct UnkStruct_02088AAC *r0) { case 2: case 3: case 4: - GF_ASSERT(Bag_TakeItem(r0->poffinCaseAppData->bag, (u16)r0->item, 1, r0->heapId)); + GF_ASSERT(Bag_TakeItem(r0->poffinCaseAppData->bag, (u16)r0->item, 1, r0->heapID)); return 4; } } @@ -134,14 +134,14 @@ u32 sub_02088C3C(struct UnkStruct_02088AAC *r0) { .ovly = FS_OVERLAY_ID(OVERLAY_68) }; - r0->ovly_param = sub_020851B8((u8)r0->heapId); + r0->ovly_param = sub_020851B8((u8)r0->heapID); sub_020851DC(r0->ovly_param, (u16)r0->item, TRUE); u8 berry_count = 0; for (u8 berry_id = 0; berry_id < (u8)NUM_BERRIES; berry_id++) { u8 item_id = (u8)BerryToItemId(berry_id); - if (Bag_HasItem(bag, item_id, 1, r0->heapId) == TRUE) { + if (Bag_HasItem(bag, item_id, 1, r0->heapID) == TRUE) { sub_020851DC(r0->ovly_param, item_id, 0); berry_count++; @@ -154,7 +154,7 @@ u32 sub_02088C3C(struct UnkStruct_02088AAC *r0) { BagCursor_Field_PocketGetPosition(r0->unk0C, 4, &sp6, &sp5); sub_020851F8(r0->ovly_param, sp5, sp6, (u8)(berry_count + 2)); - r0->ovly_data = OverlayManager_New(&OVERLAY_68_MANAGER, (s32 *)r0->ovly_param, r0->heapId); + r0->ovly_data = OverlayManager_New(&OVERLAY_68_MANAGER, (s32 *)r0->ovly_param, r0->heapID); return 3; } @@ -169,7 +169,7 @@ u32 sub_02088CDC(struct UnkStruct_02088AAC *r0) { sub_0208524C(r0->ovly_param, &sp0, &sp1); BagCursor_Field_PocketSetPosition(r0->unk0C, 4, sp1, sp0); - FreeToHeap(r0->ovly_param); + Heap_Free(r0->ovly_param); r0->ovly_param = NULL; diff --git a/arm9/src/unk_0208A300.c b/arm9/src/unk_0208A300.c index 07fe6132a..bd4299f6f 100644 --- a/arm9/src/unk_0208A300.c +++ b/arm9/src/unk_0208A300.c @@ -4,8 +4,8 @@ #include "heap.h" -struct UnkStruct_0208A300 *sub_0208A300(HeapID heapId) { - struct UnkStruct_0208A300 *ret = AllocFromHeap(heapId, sizeof(struct UnkStruct_0208A300)); +struct UnkStruct_0208A300 *sub_0208A300(enum HeapID heapID) { + struct UnkStruct_0208A300 *ret = Heap_Alloc(heapID, sizeof(struct UnkStruct_0208A300)); memset(ret, 0, sizeof(struct UnkStruct_0208A300)); ret->unk4 = 2; @@ -14,7 +14,7 @@ struct UnkStruct_0208A300 *sub_0208A300(HeapID heapId) { } void sub_0208A320(struct UnkStruct_0208A300 *unk) { - FreeToHeap(unk); + Heap_Free(unk); } u32 sub_0208A328(struct UnkStruct_0208A300 *unk) { diff --git a/arm9/src/use_item_on_mon.c b/arm9/src/use_item_on_mon.c index 1a9b18d74..2674d7395 100644 --- a/arm9/src/use_item_on_mon.c +++ b/arm9/src/use_item_on_mon.c @@ -10,7 +10,7 @@ #include "party.h" #include "pokemon.h" -BOOL CanUseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveId, HeapID heapId) { +BOOL CanUseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveId, enum HeapID heapID) { s32 atkEv; s32 defEv; s32 speedEv; @@ -21,70 +21,70 @@ BOOL CanUseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveId, HeapID struct ItemData *itemData; u32 status; - itemData = LoadItemDataOrGfx(itemId, ITEMDATA_DATA, heapId); + itemData = LoadItemDataOrGfx(itemId, ITEMDATA_DATA, heapID); if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_PARTY_USE) != 1) { - FreeToHeap(itemData); + Heap_Free(itemData); return FALSE; } status = GetMonData(pokemon, MON_DATA_STATUS, NULL); // slp if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_SLP_HEAL) && (status & MON_STATUS_SLP_MASK)) { - FreeToHeap(itemData); + Heap_Free(itemData); return TRUE; } // psn if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_PSN_HEAL) && (status & (MON_STATUS_PSN_MASK | MON_STATUS_TOX_MASK))) { - FreeToHeap(itemData); + Heap_Free(itemData); return TRUE; } // brn if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_BRN_HEAL) && (status & MON_STATUS_BRN_MASK)) { - FreeToHeap(itemData); + Heap_Free(itemData); return TRUE; } // frz if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_FRZ_HEAL) && (status & MON_STATUS_FRZ_MASK)) { - FreeToHeap(itemData); + Heap_Free(itemData); return TRUE; } // prz if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_PRZ_HEAL) && (status & MON_STATUS_PRZ_MASK)) { - FreeToHeap(itemData); + Heap_Free(itemData); return TRUE; } hp = GetMonData(pokemon, MON_DATA_HP, NULL); if ((GetItemAttr_PreloadedItemData(itemData, ITEMATTR_REVIVE) || GetItemAttr_PreloadedItemData(itemData, ITEMATTR_REVIVE_ALL)) && !GetItemAttr_PreloadedItemData(itemData, ITEMATTR_LEVEL_UP)) { if (hp == 0) { - FreeToHeap(itemData); + Heap_Free(itemData); return TRUE; } } else if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_HP_RESTORE) && hp != 0 && hp < GetMonData(pokemon, MON_DATA_MAX_HP, NULL)) { - FreeToHeap(itemData); + Heap_Free(itemData); return TRUE; } if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_LEVEL_UP) && GetMonData(pokemon, MON_DATA_LEVEL, NULL) < MAX_LEVEL) { - FreeToHeap(itemData); + Heap_Free(itemData); return TRUE; } if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_EVOLVE) && GetMonEvolution(NULL, pokemon, 3, itemId, NULL) != SPECIES_NONE) { - FreeToHeap(itemData); + Heap_Free(itemData); return TRUE; } if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_PP_UP) || GetItemAttr_PreloadedItemData(itemData, ITEMATTR_PP_MAX)) { if (GetMonData(pokemon, MON_DATA_MOVE1_PP_UPS + moveId, NULL) < 3 && WazaGetMaxPp((u16)GetMonData(pokemon, MON_DATA_MOVE1 + moveId, NULL), 0) >= 5) { - FreeToHeap(itemData); + Heap_Free(itemData); return TRUE; } } if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_PP_RESTORE) && MonMoveCanRestorePP(pokemon, moveId) == TRUE) { - FreeToHeap(itemData); + Heap_Free(itemData); return TRUE; } if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_PP_RESTORE_ALL)) { for (int i = 0; i < MAX_MON_MOVES; i++) { if (MonMoveCanRestorePP(pokemon, i) == TRUE) { - FreeToHeap(itemData); + Heap_Free(itemData); return TRUE; } } @@ -99,15 +99,15 @@ BOOL CanUseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveId, HeapID s32 dHpEv = (s32)GetItemAttr_PreloadedItemData(itemData, ITEMATTR_HP_EV_UP_PARAM); if (dHpEv > 0) { if (hpEv < MAX_EV && (hpEv + atkEv + defEv + speedEv + spAtkEv + spDefEv) < MAX_EV_SUM) { - FreeToHeap(itemData); + Heap_Free(itemData); return TRUE; } } else if (dHpEv < 0) { if (hpEv > 0) { - FreeToHeap(itemData); + Heap_Free(itemData); return TRUE; } else if (CanItemModFriendship(pokemon, itemData) == TRUE) { - FreeToHeap(itemData); + Heap_Free(itemData); return TRUE; } } @@ -116,15 +116,15 @@ BOOL CanUseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveId, HeapID s32 dAtkEv = (s32)GetItemAttr_PreloadedItemData(itemData, ITEMATTR_ATK_EV_UP_PARAM); if (dAtkEv > 0) { if (atkEv < MAX_EV && (hpEv + atkEv + defEv + speedEv + spAtkEv + spDefEv) < MAX_EV_SUM) { - FreeToHeap(itemData); + Heap_Free(itemData); return TRUE; } } else if (dAtkEv < 0) { if (atkEv > 0) { - FreeToHeap(itemData); + Heap_Free(itemData); return TRUE; } else if (CanItemModFriendship(pokemon, itemData) == TRUE) { - FreeToHeap(itemData); + Heap_Free(itemData); return TRUE; } } @@ -133,15 +133,15 @@ BOOL CanUseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveId, HeapID s32 dDefEv = (s32)GetItemAttr_PreloadedItemData(itemData, ITEMATTR_DEF_EV_UP_PARAM); if (dDefEv > 0) { if (defEv < MAX_EV && (hpEv + atkEv + defEv + speedEv + spAtkEv + spDefEv) < MAX_EV_SUM) { - FreeToHeap(itemData); + Heap_Free(itemData); return TRUE; } } else if (dDefEv < 0) { if (defEv > 0) { - FreeToHeap(itemData); + Heap_Free(itemData); return TRUE; } else if (CanItemModFriendship(pokemon, itemData) == TRUE) { - FreeToHeap(itemData); + Heap_Free(itemData); return TRUE; } } @@ -150,15 +150,15 @@ BOOL CanUseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveId, HeapID s32 dSpeedEv = (s32)GetItemAttr_PreloadedItemData(itemData, ITEMATTR_SPEED_EV_UP_PARAM); if (dSpeedEv > 0) { if (speedEv < MAX_EV && (hpEv + atkEv + defEv + speedEv + spAtkEv + spDefEv) < MAX_EV_SUM) { - FreeToHeap(itemData); + Heap_Free(itemData); return TRUE; } } else if (dSpeedEv < 0) { if (speedEv > 0) { - FreeToHeap(itemData); + Heap_Free(itemData); return TRUE; } else if (CanItemModFriendship(pokemon, itemData) == TRUE) { - FreeToHeap(itemData); + Heap_Free(itemData); return TRUE; } } @@ -167,15 +167,15 @@ BOOL CanUseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveId, HeapID s32 dSpAtkEv = (s32)GetItemAttr_PreloadedItemData(itemData, ITEMATTR_SPATK_EV_UP_PARAM); if (dSpAtkEv > 0) { if (spAtkEv < MAX_EV && (hpEv + atkEv + defEv + speedEv + spAtkEv + spDefEv) < MAX_EV_SUM) { - FreeToHeap(itemData); + Heap_Free(itemData); return TRUE; } } else if (dSpAtkEv < 0) { if (spAtkEv > 0) { - FreeToHeap(itemData); + Heap_Free(itemData); return TRUE; } else if (CanItemModFriendship(pokemon, itemData) == TRUE) { - FreeToHeap(itemData); + Heap_Free(itemData); return TRUE; } } @@ -185,29 +185,29 @@ BOOL CanUseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveId, HeapID s32 dSpDefEv = (s32)GetItemAttr_PreloadedItemData(itemData, ITEMATTR_SPDEF_EV_UP_PARAM); if (dSpDefEv > 0) { if (spDefEv < MAX_EV && (hpEv + atkEv + defEv + speedEv + spAtkEv + spDefEv) < MAX_EV_SUM) { - FreeToHeap(itemData); + Heap_Free(itemData); return TRUE; } } else if (dSpDefEv < 0) { if (spDefEv > 0) { - FreeToHeap(itemData); + Heap_Free(itemData); return TRUE; } else if (CanItemModFriendship(pokemon, itemData) == TRUE) { - FreeToHeap(itemData); + Heap_Free(itemData); return TRUE; } } } - FreeToHeap(itemData); + Heap_Free(itemData); return FALSE; } -BOOL CanUseItemOnMonInParty(struct Party *party, u16 itemId, s32 partyIdx, s32 moveIdx, HeapID heapId) { +BOOL CanUseItemOnMonInParty(struct Party *party, u16 itemId, s32 partyIdx, s32 moveIdx, enum HeapID heapID) { struct Pokemon *pokemon = Party_GetMonByIndex(party, partyIdx); - return CanUseItemOnPokemon(pokemon, itemId, moveIdx, heapId); + return CanUseItemOnPokemon(pokemon, itemId, moveIdx, heapID); } -BOOL UseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveIdx, u16 location, HeapID heapId) { +BOOL UseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveIdx, u16 location, enum HeapID heapID) { s32 stack_data[8]; #define sp6C stack_data[7] #define sp68 stack_data[6] @@ -220,9 +220,9 @@ BOOL UseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveIdx, u16 loca BOOL hadEffect; BOOL effectFound; - struct ItemData *itemData = LoadItemDataOrGfx(itemId, ITEMDATA_DATA, heapId); + struct ItemData *itemData = LoadItemDataOrGfx(itemId, ITEMDATA_DATA, heapID); if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_PARTY_USE) != 1) { - FreeToHeap(itemData); + Heap_Free(itemData); return FALSE; } hadEffect = FALSE; @@ -399,32 +399,32 @@ BOOL UseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveIdx, u16 loca } } if (hadEffect == FALSE && effectFound == TRUE) { - FreeToHeap(itemData); + Heap_Free(itemData); return FALSE; } { sp50 = (s32)GetMonData(pokemon, MON_DATA_FRIENDSHIP, NULL); if (sp50 < 100) { if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_FRIENDSHIP_MOD_LO)) { - DoItemFriendshipMod(pokemon, sp50, (s32)GetItemAttr_PreloadedItemData(itemData, ITEMATTR_FRIENDSHIP_MOD_LO_PARAM), location, heapId); - FreeToHeap(itemData); + DoItemFriendshipMod(pokemon, sp50, (s32)GetItemAttr_PreloadedItemData(itemData, ITEMATTR_FRIENDSHIP_MOD_LO_PARAM), location, heapID); + Heap_Free(itemData); return hadEffect; } } else if (sp50 >= 100 && sp50 < 200) { if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_FRIENDSHIP_MOD_MED)) { - DoItemFriendshipMod(pokemon, sp50, (s32)GetItemAttr_PreloadedItemData(itemData, ITEMATTR_FRIENDSHIP_MOD_MED_PARAM), location, heapId); - FreeToHeap(itemData); + DoItemFriendshipMod(pokemon, sp50, (s32)GetItemAttr_PreloadedItemData(itemData, ITEMATTR_FRIENDSHIP_MOD_MED_PARAM), location, heapID); + Heap_Free(itemData); return hadEffect; } } else if (sp50 >= 200 && sp50 <= 255) { if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_FRIENDSHIP_MOD_HI)) { - DoItemFriendshipMod(pokemon, sp50, (s32)GetItemAttr_PreloadedItemData(itemData, ITEMATTR_FRIENDSHIP_MOD_HI_PARAM), location, heapId); - FreeToHeap(itemData); + DoItemFriendshipMod(pokemon, sp50, (s32)GetItemAttr_PreloadedItemData(itemData, ITEMATTR_FRIENDSHIP_MOD_HI_PARAM), location, heapID); + Heap_Free(itemData); return hadEffect; } } } - FreeToHeap(itemData); + Heap_Free(itemData); return hadEffect; } #undef sp6C @@ -436,9 +436,9 @@ BOOL UseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveIdx, u16 loca #undef sp54 #undef sp50 -BOOL UseItemOnMonInParty(struct Party *party, u16 itemId, s32 partyIdx, s32 moveIdx, u16 location, HeapID heapId) { +BOOL UseItemOnMonInParty(struct Party *party, u16 itemId, s32 partyIdx, s32 moveIdx, u16 location, enum HeapID heapID) { struct Pokemon *pokemon = Party_GetMonByIndex(party, partyIdx); - return UseItemOnPokemon(pokemon, itemId, moveIdx, location, heapId); + return UseItemOnPokemon(pokemon, itemId, moveIdx, location, heapID); } u8 MonMoveCanRestorePP(struct Pokemon *pokemon, s32 moveIdx) { @@ -568,7 +568,7 @@ BOOL CanItemModFriendship(struct Pokemon *pokemon, struct ItemData *itemData) { return FALSE; } -BOOL DoItemFriendshipMod(struct Pokemon *pokemon, s32 friendship, s32 mod, u16 location, HeapID heapId) { +BOOL DoItemFriendshipMod(struct Pokemon *pokemon, s32 friendship, s32 mod, u16 location, enum HeapID heapID) { if (friendship == 255 && mod > 0) { return FALSE; } @@ -576,7 +576,7 @@ BOOL DoItemFriendshipMod(struct Pokemon *pokemon, s32 friendship, s32 mod, u16 l return FALSE; } if (mod > 0) { - if (GetItemAttr((u16)GetMonData(pokemon, MON_DATA_HELD_ITEM, NULL), ITEMATTR_HOLD_EFFECT, heapId) == HOLD_EFFECT_FRIENDSHIP_UP) { + if (GetItemAttr((u16)GetMonData(pokemon, MON_DATA_HELD_ITEM, NULL), ITEMATTR_HOLD_EFFECT, heapID) == HOLD_EFFECT_FRIENDSHIP_UP) { mod = mod * 150 / 100; } if (GetMonData(pokemon, MON_DATA_POKEBALL, NULL) == ITEM_LUXURY_BALL) { diff --git a/arm9/src/wfc_user_info_warning.c b/arm9/src/wfc_user_info_warning.c index 23369a368..c242a7b3c 100644 --- a/arm9/src/wfc_user_info_warning.c +++ b/arm9/src/wfc_user_info_warning.c @@ -69,7 +69,7 @@ static const struct GraphicsBanks sWFCWarningMsgGraphicsBanks = { .texpltt = GX_VRAM_TEXPLTT_NONE, }; -void ShowWFCUserInfoWarning(HeapID heapId, u32 a1) { +void ShowWFCUserInfoWarning(enum HeapID heapID, u32 a1) { #pragma unused(a1) struct Window window; @@ -96,20 +96,20 @@ void ShowWFCUserInfoWarning(HeapID heapId, u32 a1) { GXS_SetVisibleWnd(0); GfGfx_SetBanks(&sWFCWarningMsgGraphicsBanks); - struct BgConfig *bg_config = BgConfig_Alloc(heapId); + struct BgConfig *bg_config = BgConfig_Alloc(heapID); SetBothScreensModesAndDisable(&sWFCWarningMsgGraphicsModes); InitBgFromTemplate(bg_config, 0, &sWFCWarningMsgBgTemplate, 0); BgClearTilemapBufferAndCommit(bg_config, GF_BG_LYR_MAIN_0); - LoadUserFrameGfx1(bg_config, GF_BG_LYR_MAIN_0, 0x01F7, 2, 0, heapId); - LoadFontPal0(GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_1_OFFSET, heapId); - BG_ClearCharDataRange(GF_BG_LYR_MAIN_0, 0x20, 0, heapId); + LoadUserFrameGfx1(bg_config, GF_BG_LYR_MAIN_0, 0x01F7, 2, 0, heapID); + LoadFontPal0(GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_1_OFFSET, heapID); + BG_ClearCharDataRange(GF_BG_LYR_MAIN_0, 0x20, 0, heapID); BG_SetMaskColor(GF_BG_LYR_MAIN_0, RGB(1, 1, 27)); BG_SetMaskColor(GF_BG_LYR_SUB_0, RGB(1, 1, 27)); - struct MsgData *warning_messages_data = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0613_bin, heapId); - struct String *warning_message = String_New(384, heapId); + struct MsgData *warning_messages_data = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0613_bin, heapID); + struct String *warning_message = String_New(384, heapID); ResetAllTextPrinters(); AddWindow(bg_config, &window, &sWFCWarningMsgWindowTemplate); FillWindowPixelRect(&window, 0xF, 0, 0, 208, 144); @@ -149,5 +149,5 @@ void ShowWFCUserInfoWarning(HeapID heapId, u32 a1) { ToggleBgLayer(GF_BG_LYR_SUB_3, GX_PLANE_TOGGLE_OFF); FreeBgTilemapBuffer(bg_config, GF_BG_LYR_MAIN_0); - FreeToHeap(bg_config); + Heap_Free(bg_config); } diff --git a/include/bag.h b/include/bag.h index be8c725d0..3d1fa98fe 100644 --- a/include/bag.h +++ b/include/bag.h @@ -19,21 +19,21 @@ typedef struct Bag { } Bag; u32 Save_Bag_sizeof(void); -Bag *Save_Bag_New(HeapID heapId); +Bag *Save_Bag_New(enum HeapID heapID); void Save_Bag_Init(Bag *bag); void Save_Bag_Copy(const Bag *src, Bag *dest); u32 Bag_GetRegisteredItem(Bag *bag); void Bag_SetRegisteredItem(Bag *bag, u32 item); -BOOL Bag_HasSpaceForItem(Bag *bag, u16 itemId, u16 quantity, HeapID heapId); -BOOL Bag_AddItem(Bag *bag, u16 itemId, u16 quantity, HeapID heapId); -BOOL Bag_TakeItem(Bag *bag, u16 itemId, u16 quantity, HeapID heapId); +BOOL Bag_HasSpaceForItem(Bag *bag, u16 itemId, u16 quantity, enum HeapID heapID); +BOOL Bag_AddItem(Bag *bag, u16 itemId, u16 quantity, enum HeapID heapID); +BOOL Bag_TakeItem(Bag *bag, u16 itemId, u16 quantity, enum HeapID heapID); BOOL Pocket_TakeItem(ItemSlot *slots, u32 count, u16 itemId, u16 quantity); -BOOL Bag_HasItem(Bag *bag, u16 itemId, u16 quantity, HeapID heapId); +BOOL Bag_HasItem(Bag *bag, u16 itemId, u16 quantity, enum HeapID heapID); BOOL Bag_PocketNotEmpty(Bag *bag, u32 pocket); -u16 Bag_GetQuantity(Bag *bag, u16 itemId, HeapID heapId); +u16 Bag_GetQuantity(Bag *bag, u16 itemId, enum HeapID heapID); u16 Pocket_GetQuantity(ItemSlot *slots, u32 count, u16 itemId); void SortPocket(ItemSlot *slots, u32 count); -BagView *Bag_CreateView(Bag *bag, const u8 *pockets, HeapID heapId); +BagView *Bag_CreateView(Bag *bag, const u8 *pockets, enum HeapID heapID); ItemSlot *Bag_GetPocketSlotN(Bag *bag, u8 pocket, u32 slot); Bag *Save_Bag_Get(SaveData *saveData); diff --git a/include/bag_cursor.h b/include/bag_cursor.h index 37567fde6..aa5c57b54 100644 --- a/include/bag_cursor.h +++ b/include/bag_cursor.h @@ -25,7 +25,7 @@ typedef struct BagCursor { BagCursorBattle battle; } BagCursor; -BagCursor *BagCursor_New(HeapID heapId); +BagCursor *BagCursor_New(enum HeapID heapID); void BagCursor_Field_PocketGetPosition(BagCursor *cursor, u32 pocket, u8 *position, u8 *scroll); u16 BagCursor_Field_GetPocket(BagCursor *cursor); void BagCursor_Field_PocketSetPosition(BagCursor *cursor, u32 pocket, u8 position, u8 scroll); diff --git a/include/bag_view.h b/include/bag_view.h index db874cbcc..e0b3a3829 100644 --- a/include/bag_view.h +++ b/include/bag_view.h @@ -37,7 +37,7 @@ typedef struct BagView { u16 unk76_1 : 15; } BagView; // total size = 0x78 -BagView *BagView_New(u8 heapId); +BagView *BagView_New(u8 heapID); u32 BagView_sizeof(void); void sub_0206E30C(BagView *bagView, u8 r1); void sub_0206E314(BagView *bagView, SaveData *save, u8 r2, BagCursor *cursor); @@ -50,7 +50,7 @@ u16 sub_0206E37C(BagView *bagView); u16 sub_0206E384(BagView *bagView); u8 sub_0206E38C(BagView *bagView); u8 sub_0206E394(BagView *bagView); -BOOL TryFormatRegisteredKeyItemUseMessage(SaveData *saveData, String *dest, u32 itemId, HeapID heapId); -void GetItemUseErrorMessage(PlayerProfile *playerProfile, String *dest, u16 itemId, enum ItemUseError code, HeapID heapId); +BOOL TryFormatRegisteredKeyItemUseMessage(SaveData *saveData, String *dest, u32 itemId, enum HeapID heapID); +void GetItemUseErrorMessage(PlayerProfile *playerProfile, String *dest, u16 itemId, enum ItemUseError code, enum HeapID heapID); #endif // POKEDIAMOND_BAG_VIEW_H diff --git a/include/bg_window.h b/include/bg_window.h index 01adbda01..1c030246c 100644 --- a/include/bg_window.h +++ b/include/bg_window.h @@ -49,7 +49,7 @@ typedef struct Background { } Background; typedef struct BgConfig { - HeapID heapId; + enum HeapID heapID; u16 scrollScheduled; u16 bufferTransferScheduled; Background bgs[8]; @@ -206,8 +206,8 @@ enum { #define TILEMAP_FILL_KEEP_PAL 16 // Do not replace the selected palette index #define TILEMAP_FILL_OVWT_PAL 17 // Fill value includes palette -BgConfig *BgConfig_Alloc(HeapID heapId); -HeapID BgConfig_GetHeapId(BgConfig *bgConfig); +BgConfig *BgConfig_Alloc(enum HeapID heapID); +enum HeapID BgConfig_GetHeapId(BgConfig *bgConfig); void SetBothScreensModesAndDisable(const GraphicsModes *modes); void SetScreenModeAndDisable(const struct GraphicsModes *gfxModes, enum GFScreen screen); void InitBgFromTemplate(BgConfig *bgConfig, u8 bgId, const BgTemplate *template, u8 bgMode); @@ -224,7 +224,7 @@ void BgCommitTilemapBufferToVram(BgConfig *bgConfig, u8 bgId); void BgCopyOrUncompressTilemapBufferRangeToVram(BgConfig *bgConfig, u8 bgId, const void *buffer, u32 bufferSize, u32 baseTile); void BG_LoadScreenTilemapData(BgConfig *bgConfig, u8 bgId, const void *data, u32 size); void BG_LoadCharTilesData(BgConfig *bgConfig, u8 bgId, const void *data, u32 size, u32 tileStart); -void BG_ClearCharDataRange(u8 bgId, u32 size, u32 offset, HeapID heapId); +void BG_ClearCharDataRange(u8 bgId, u32 size, u32 offset, enum HeapID heapID); void BG_FillCharDataRange(BgConfig *bgConfig, enum GFBgLayer bgId, u32 fillValue, u32 ntiles, u32 offset); void BG_LoadPlttData(u32 location, void *plttData, u32 size, enum GFPalSlotOffset offset); void BG_SetMaskColor(u8 bgId, u16 value); @@ -237,13 +237,13 @@ void BgClearTilemapBufferAndCommit(BgConfig *bgConfig, u8 bgId); void BgFillTilemapBufferAndCommit(BgConfig *bgConfig, u8 bgId, u16 fillValue); void BgFillTilemapBufferAndSchedule(BgConfig *bgConfig, u8 bgId, u16 fillValue); void *BgGetCharPtr(u8 bgId); -u8 *Convert4bppTo8bpp(u8 *src4Bpp, u32 size, u8 paletteNum, HeapID heapId); +u8 *Convert4bppTo8bpp(u8 *src4Bpp, u32 size, u8 paletteNum, enum HeapID heapID); void *GetBgTilemapBuffer(BgConfig *bgConfig, u8 bgId); u16 GetBgRotation(BgConfig *bgConfig, u8 bgId); u8 GetBgPriority(BgConfig *bgConfig, u8 bgId); void BlitBitmapRect4Bit(const Bitmap *src, const Bitmap *dest, u16 srcX, u16 srcY, u16 destX, u16 destY, u16 width, u16 height, u16 colorKey); void FillBitmapRect8Bit(const Bitmap *surface, u16 x, u16 y, u16 width, u16 height, u8 fillValue); -Window *AllocWindows(HeapID heapId, s32 num); +Window *AllocWindows(enum HeapID heapID, s32 num); void InitWindow(Window *window); BOOL WindowIsInUse(const Window *window); void AddWindowParameterized(BgConfig *bgConfig, Window *window, u8 bgId, u8 x, u8 y, u8 width, u8 height, u8 paletteNum, u16 baseTile); @@ -274,8 +274,8 @@ u8 GetWindowY(Window *window); void SetWindowX(Window *window, u8 x); void SetWindowY(Window *window, u8 y); void SetWindowPaletteNum(Window *window, u8 paletteNum); -NNSG2dCharacterData *LoadCharacterDataFromFile(void **char_ret, HeapID heapId, const char *path); -NNSG2dPaletteData *LoadPaletteDataFromFile(void **pltt_ret, HeapID heapId, const char *path); +NNSG2dCharacterData *LoadCharacterDataFromFile(void **char_ret, enum HeapID heapID, const char *path); +NNSG2dPaletteData *LoadPaletteDataFromFile(void **pltt_ret, enum HeapID heapID, const char *path); void DoScheduledBgGpuUpdates(BgConfig *bgConfig); void ScheduleBgTilemapBufferTransfer(BgConfig *bgConfig, u8 bgId); void ScheduleSetBgPosText(BgConfig *bgConfig, u8 bgId, enum BgPosAdjustOp op, fx32 value); diff --git a/include/camera.h b/include/camera.h index bd563b9b7..2a50e5296 100644 --- a/include/camera.h +++ b/include/camera.h @@ -61,9 +61,9 @@ typedef struct Camera { CameraHistory *history; } Camera; -void Camera_History_New(s32 count, s32 initialWriteIdx, s32 updateEnableFlags, HeapID heapId, Camera *camera); +void Camera_History_New(s32 count, s32 initialWriteIdx, s32 updateEnableFlags, enum HeapID heapID, Camera *camera); void Camera_History_Delete(Camera *camera); -Camera *Camera_New(HeapID heapId); +Camera *Camera_New(enum HeapID heapID); void Camera_Delete(Camera *camera); void Camera_Copy(Camera *src, Camera *dest); void Camera_SetStaticPtr(Camera *camera); diff --git a/include/communication_error.h b/include/communication_error.h index 571c54ece..4d6e739af 100644 --- a/include/communication_error.h +++ b/include/communication_error.h @@ -3,6 +3,6 @@ #include "heap.h" -void ShowCommunicationError(HeapID heapId, u32 error, u32 errorCode); +void ShowCommunicationError(enum HeapID heapID, u32 error, u32 errorCode); #endif diff --git a/include/constants/heap.h b/include/constants/heap.h new file mode 100644 index 000000000..e48107d38 --- /dev/null +++ b/include/constants/heap.h @@ -0,0 +1,91 @@ +#ifndef POKEDIAMOND_CONSTANTS_HEAP_H +#define POKEDIAMOND_CONSTANTS_HEAP_H + +enum HeapID { + HEAP_ID_DEFAULT, + HEAP_ID_1, + HEAP_ID_2, + HEAP_ID_MAIN, + HEAP_ID_4, + HEAP_ID_5, + HEAP_ID_6, + HEAP_ID_POKETCH_MAIN, + HEAP_ID_POKETCH_APP, + HEAP_ID_9, + HEAP_ID_10, + HEAP_ID_FIELD, + HEAP_ID_12, + HEAP_ID_13, + HEAP_ID_14, + HEAP_ID_15, + HEAP_ID_16, + HEAP_ID_17, + HEAP_ID_18, + HEAP_ID_19, + HEAP_ID_20, + HEAP_ID_21, + HEAP_ID_22, + HEAP_ID_23, + HEAP_ID_24, + HEAP_ID_25, + HEAP_ID_26, + HEAP_ID_27, + HEAP_ID_28, + HEAP_ID_29, + HEAP_ID_30, + HEAP_ID_31, + HEAP_ID_32, + HEAP_ID_33, + HEAP_ID_34, + HEAP_ID_35, + HEAP_ID_36, + HEAP_ID_37, + HEAP_ID_38, + HEAP_ID_39, + HEAP_ID_40, + HEAP_ID_41, + HEAP_ID_42, + HEAP_ID_43, + HEAP_ID_44, + HEAP_ID_45, + HEAP_ID_46, + HEAP_ID_47, + HEAP_ID_48, + HEAP_ID_49, + HEAP_ID_50, + HEAP_ID_51, + HEAP_ID_52, + HEAP_ID_53, + HEAP_ID_54, + HEAP_ID_55, + HEAP_ID_56, + HEAP_ID_57, + HEAP_ID_58, + HEAP_ID_59, + HEAP_ID_60, + HEAP_ID_61, + HEAP_ID_62, + HEAP_ID_63, + HEAP_ID_64, + HEAP_ID_65, + HEAP_ID_66, + HEAP_ID_67, + HEAP_ID_68, + HEAP_ID_69, + HEAP_ID_70, + HEAP_ID_71, + HEAP_ID_72, + HEAP_ID_73, + HEAP_ID_74, + HEAP_ID_75, + HEAP_ID_76, + HEAP_ID_77, + HEAP_ID_78, + HEAP_ID_79, + HEAP_ID_80, + HEAP_ID_81, + HEAP_ID_INTRO, + HEAP_ID_INTRO_TV, +}; + +#endif // POKEDIAMOND_CONSTANTS_HEAP_H diff --git a/include/easy_chat.h b/include/easy_chat.h index 3f27aecd6..83b6c67fa 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -8,7 +8,7 @@ typedef u16 ecword_t; typedef struct EasyChatManager { - HeapID heapId; + enum HeapID heapID; MsgData *msgData[EC_GROUP_MAX]; } EasyChatManager; @@ -17,7 +17,7 @@ typedef struct SaveEasyChat { u32 trendy; } SaveEasyChat; -EasyChatManager *EasyChatManager_New(HeapID heapId); +EasyChatManager *EasyChatManager_New(enum HeapID heapID); void EasyChatManager_Delete(EasyChatManager *easyChatManager); void EasyChatManager_ReadWordIntoString(EasyChatManager *easyChatManager, u16 ecWord, String *dest); void GetECWordIntoStringByIndex(u32 ecWord, String *dest); diff --git a/include/encounter.h b/include/encounter.h index 89f04b639..647fe15cb 100644 --- a/include/encounter.h +++ b/include/encounter.h @@ -30,7 +30,7 @@ void SetupAndStartWildBattle(TaskManager *taskManager, u16 species, u8 level, u3 void sub_02046F70(FieldSystem *fieldSystem, BattleSetup *setup); void SetupAndStartFirstBattle(TaskManager *taskManager, u16 species, u8 level); void SetupAndStartTutorialBattle(TaskManager *taskManager); -void SetupAndStartTrainerBattle(TaskManager *taskManager, u32 opponentTrainer1, u32 opponentTrainer2, u32 followerTrainerNum, HeapID heapId, u32 *winFlag); +void SetupAndStartTrainerBattle(TaskManager *taskManager, u32 opponentTrainer1, u32 opponentTrainer2, u32 followerTrainerNum, enum HeapID heapID, u32 *winFlag); void sub_02047174(TaskManager *taskManager, void *param1, u32 battleType); void sub_020471C0(TaskManager *taskManager, s32 target, s32 maxLevel, u32 flag); void sub_0204726C(FieldSystem *fieldSystem, void *param1, s32 battleType); diff --git a/include/field_move_environment.h b/include/field_move_environment.h index c21fec170..f66151c96 100644 --- a/include/field_move_environment.h +++ b/include/field_move_environment.h @@ -14,6 +14,6 @@ typedef struct FieldMoveEnvironment { FieldMoveData *moveData; } FieldMoveEnvironment; -FieldMoveEnvironment *FieldMove_CreateEnvironment(HeapID heapId, u8 slotNo, SaveData *saveData); +FieldMoveEnvironment *FieldMove_CreateEnvironment(enum HeapID heapID, u8 slotNo, SaveData *saveData); #endif // POKEDIAMOND_FIELD_MOVE_ENVIRONMENT_H diff --git a/include/filesystem.h b/include/filesystem.h index 929f1d54a..bf87d6799 100644 --- a/include/filesystem.h +++ b/include/filesystem.h @@ -163,17 +163,17 @@ typedef enum NarcId { } NarcId; void ReadFromNarcMemberByPathAndId(void *dest, const char *path, s32 file_idx, u32 offset, u32 size); -void *AllocAndReadFromNarcMemberByPathAndId(const char *path, s32 file_idx, HeapID heapId, u32 offset, u32 size, BOOL r4); +void *AllocAndReadFromNarcMemberByPathAndId(const char *path, s32 file_idx, enum HeapID heapID, u32 offset, u32 size, BOOL r4); void ReadWholeNarcMemberByIdPair(void *dest, NarcId narc_id, s32 file_id); -void *AllocAndReadWholeNarcMemberByIdPair(NarcId narc_id, s32 file_id, HeapID heapId); -void *AllocAtEndAndReadWholeNarcMemberByIdPair(NarcId narc_id, s32 file_id, HeapID heapId); +void *AllocAndReadWholeNarcMemberByIdPair(NarcId narc_id, s32 file_id, enum HeapID heapID); +void *AllocAtEndAndReadWholeNarcMemberByIdPair(NarcId narc_id, s32 file_id, enum HeapID heapID); void ReadFromNarcMemberByIdPair(void *dest, NarcId narc_id, s32 file_id, u32 offset, u32 size); -void *AllocAndReadFromNarcMemberByIdPair(NarcId narc_id, s32 file_id, HeapID heapId, u32 offset, u32 size); -void *AllocAtEndAndReadFromNarcMemberByIdPair(NarcId narc_id, s32 file_id, HeapID heapId, u32 offset, u32 size); +void *AllocAndReadFromNarcMemberByIdPair(NarcId narc_id, s32 file_id, enum HeapID heapID, u32 offset, u32 size); +void *AllocAtEndAndReadFromNarcMemberByIdPair(NarcId narc_id, s32 file_id, enum HeapID heapID, u32 offset, u32 size); u32 GetNarcMemberSizeByIdPair(NarcId narc_id, s32 file_idx); -NARC *NARC_New(NarcId narc_id, HeapID heapId); +NARC *NARC_New(NarcId narc_id, enum HeapID heapID); void NARC_Delete(NARC *narc); -void *NARC_AllocAndReadWholeMember(NARC *narc, u32 file_id, HeapID heapId); +void *NARC_AllocAndReadWholeMember(NARC *narc, u32 file_id, enum HeapID heapID); void NARC_ReadWholeMember(NARC *narc, u32 file_id, void *dest); u32 NARC_GetMemberSize(NARC *narc, u32 file_id); void NARC_ReadFromMember(NARC *narc, u32 file_id, u32 pos, u32 size, void *dest); diff --git a/include/font.h b/include/font.h index e2d3e0cb9..5d2abc7aa 100644 --- a/include/font.h +++ b/include/font.h @@ -20,8 +20,8 @@ struct UnkStruct_02002C14 { extern struct UnkStruct_02002C14 *UNK_02106FC8; void sub_02002C14(); -void sub_02002C50(u32 font_id, HeapID heapId); -void sub_02002C84(s32 param0, HeapID heapId); +void sub_02002C50(u32 font_id, enum HeapID heapID); +void sub_02002C84(s32 param0, enum HeapID heapID); void sub_02002CC0(s32 param0); void sub_02002CF8(int param0); struct UnkStruct_02002C14_sub *sub_02002D94(u32 param0, u32 param1); @@ -29,8 +29,8 @@ u32 FontFunc(u32 fontId, struct TextPrinter *printer); u32 sub_02002DE0(u32 param0, u16 *str, u32 param2); u32 sub_02002E14(u32 param0, struct String *str, u32 param2); s32 GetFontAttribute(u8 fontId, s32 attr); -void LoadFontPal0(enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotOffset, HeapID heapId); -void LoadFontPal1(enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotOffset, HeapID heapId); +void LoadFontPal0(enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotOffset, enum HeapID heapID); +void LoadFontPal1(enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotOffset, enum HeapID heapID); u32 FontID_String_GetWidthMultiline(u32 param0, struct String *str, u32 param2); u32 sub_02002F40(u32 param0, struct String *str, u32 param2, u32 param3); u32 sub_02002F58(const u16 *str); diff --git a/include/game_init.h b/include/game_init.h index 9a3d862c5..363c05ded 100644 --- a/include/game_init.h +++ b/include/game_init.h @@ -25,13 +25,13 @@ void Main_ToggleHBlankInterrupt(BOOL enableFlag); void sub_02015FC8(void); void InitSystemForTheGame(void); void InitGraphicMemory(void); -void *AllocAndReadFile(HeapID heapId, const char *path); +void *AllocAndReadFile(enum HeapID heapID, const char *path); void OpenAndReadWholeFile(const char *path, void **ptr); u32 GetFilenameHash(const s8 *str); int GetFileCacheId(u32 hash); int AddFileToCache(void *contents, u32 hash); void ClearFileCache(void); -void *OpenFileCached(const s8 *str, HeapID heapId); +void *OpenFileCached(const s8 *str, enum HeapID heapID); void InitKeypadAndTouchpad(void); void sub_02016438(u8 a0); void sub_02016444(u8 a0); diff --git a/include/gf_gfx_loader.h b/include/gf_gfx_loader.h index 6a084d514..0af3c7c98 100644 --- a/include/gf_gfx_loader.h +++ b/include/gf_gfx_loader.h @@ -5,21 +5,21 @@ #include "filesystem.h" #include "heap.h" -u32 GfGfxLoader_LoadCharData(NarcId narcId, s32 memberNo, struct BgConfig *unkStruct02016B94_2, u32 layer, u32 numTiles, u32 szByte, BOOL isCompressed, HeapID heapId); -void GfGfxLoader_LoadScrnData(NarcId narcId, s32 memberNo, struct BgConfig *unkStruct02016B94_2, u32 layer, u32 tileOffset, u32 szByte, BOOL isCompressed, HeapID heapId); -void GfGfxLoader_GXLoadPal(NarcId narcId, s32 memberNo, enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotOffset, u32 szByte, HeapID heapId); -void GfGfxLoader_GXLoadPalWithSrcOffset(NarcId narcId, s32 memberNo, enum GFPalLoadLocation location, u32 srcOffset, enum GFPalSlotOffset palSlotOffset, u32 szByte, HeapID heapId); -u32 GfGfxLoader_LoadWholePalette(NarcId narcId, s32 memberId, u32 layer, u32 baseAddr, u32 szByte, BOOL isCompressed, HeapID heapId); -void GfGfxLoader_PartiallyLoadPalette(NarcId narcId, s32 memberId, NNS_G2D_VRAM_TYPE vramType, u32 baseAddr, HeapID heapId, NNSG2dImagePaletteProxy *pPltProxy); -u32 GfGfxLoader_LoadImageMapping(NarcId narcId, s32 memberId, BOOL isCompressed, u32 layer, u32 szByte, NNS_G2D_VRAM_TYPE type, u32 baseAddr, HeapID heapId, NNSG2dImageProxy *pImgProxy); -void GfGfxLoader_SetObjCntFlagsAndLoadImageMapping(NarcId narcId, s32 memberId, BOOL isCompressed, u32 layer, u32 szByte, NNS_G2D_VRAM_TYPE type, u32 baseAddr, HeapID heapId, NNSG2dImageProxy *pImageProxy); -void *GfGfxLoader_GetCharData(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dCharacterData **ppCharData, HeapID heapId); -void *GfGfxLoader_GetScrnData(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dScreenData **ppScrData, HeapID heapId); -void *GfGfxLoader_GetPlttData(NarcId narcId, s32 memberId, NNSG2dPaletteData **ppPltData, HeapID heapId); -void *GfGfxLoader_GetCellBank(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dCellDataBank **ppCellBank, HeapID heapId); -void *GfGfxLoader_GetAnimBank(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dAnimBankData **ppAnimBank, HeapID heapId); -void *GfGfxLoader_UncompressFromNarc(NarcId narcId, s32 memberId, HeapID heapId); -void *GfGfxLoader_LoadFromNarc(NarcId narcId, s32 memberNo, BOOL isCompressed, HeapID heapId, BOOL allocAtEnd); -void *GfGfxLoader_LoadFromNarc_GetSizeOut(NarcId narcId, s32 memberNo, BOOL isCompressed, HeapID heapId, BOOL allocAtEnd, u32 *size_p); +u32 GfGfxLoader_LoadCharData(NarcId narcId, s32 memberNo, struct BgConfig *unkStruct02016B94_2, u32 layer, u32 numTiles, u32 szByte, BOOL isCompressed, enum HeapID heapID); +void GfGfxLoader_LoadScrnData(NarcId narcId, s32 memberNo, struct BgConfig *unkStruct02016B94_2, u32 layer, u32 tileOffset, u32 szByte, BOOL isCompressed, enum HeapID heapID); +void GfGfxLoader_GXLoadPal(NarcId narcId, s32 memberNo, enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotOffset, u32 szByte, enum HeapID heapID); +void GfGfxLoader_GXLoadPalWithSrcOffset(NarcId narcId, s32 memberNo, enum GFPalLoadLocation location, u32 srcOffset, enum GFPalSlotOffset palSlotOffset, u32 szByte, enum HeapID heapID); +u32 GfGfxLoader_LoadWholePalette(NarcId narcId, s32 memberId, u32 layer, u32 baseAddr, u32 szByte, BOOL isCompressed, enum HeapID heapID); +void GfGfxLoader_PartiallyLoadPalette(NarcId narcId, s32 memberId, NNS_G2D_VRAM_TYPE vramType, u32 baseAddr, enum HeapID heapID, NNSG2dImagePaletteProxy *pPltProxy); +u32 GfGfxLoader_LoadImageMapping(NarcId narcId, s32 memberId, BOOL isCompressed, u32 layer, u32 szByte, NNS_G2D_VRAM_TYPE type, u32 baseAddr, enum HeapID heapID, NNSG2dImageProxy *pImgProxy); +void GfGfxLoader_SetObjCntFlagsAndLoadImageMapping(NarcId narcId, s32 memberId, BOOL isCompressed, u32 layer, u32 szByte, NNS_G2D_VRAM_TYPE type, u32 baseAddr, enum HeapID heapID, NNSG2dImageProxy *pImageProxy); +void *GfGfxLoader_GetCharData(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dCharacterData **ppCharData, enum HeapID heapID); +void *GfGfxLoader_GetScrnData(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dScreenData **ppScrData, enum HeapID heapID); +void *GfGfxLoader_GetPlttData(NarcId narcId, s32 memberId, NNSG2dPaletteData **ppPltData, enum HeapID heapID); +void *GfGfxLoader_GetCellBank(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dCellDataBank **ppCellBank, enum HeapID heapID); +void *GfGfxLoader_GetAnimBank(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dAnimBankData **ppAnimBank, enum HeapID heapID); +void *GfGfxLoader_UncompressFromNarc(NarcId narcId, s32 memberId, enum HeapID heapID); +void *GfGfxLoader_LoadFromNarc(NarcId narcId, s32 memberNo, BOOL isCompressed, enum HeapID heapID, BOOL allocAtEnd); +void *GfGfxLoader_LoadFromNarc_GetSizeOut(NarcId narcId, s32 memberNo, BOOL isCompressed, enum HeapID heapID, BOOL allocAtEnd, u32 *size_p); #endif // POKEDIAMOND_GF_GFX_LOADER_H diff --git a/include/heap.h b/include/heap.h index 263073cfa..1144d7510 100644 --- a/include/heap.h +++ b/include/heap.h @@ -5,47 +5,27 @@ #include "global.h" +#include "constants/heap.h" + #include "NNS_FND_allocator.h" #include "NNS_FND_expheap.h" -typedef enum HeapID { - HEAP_ID_DEFAULT, - HEAP_ID_1, - HEAP_ID_2, - HEAP_ID_MAIN, - HEAP_ID_4, - HEAP_ID_POKETCH_MAIN = 7, - HEAP_ID_POKETCH_APP, - HEAP_ID_FIELD = 11, - HEAP_ID_15 = 15, - HEAP_ID_32 = 32, - HEAP_ID_49 = 49, - HEAP_ID_76 = 76, - HEAP_ID_77, - HEAP_ID_INTRO = 82, - HEAP_ID_INTRO_TV = 83, -} HeapID; +typedef struct HeapParam { + u32 size; // maximum size of the heap + OSArenaId arena; // where to allocate the heap from +} HeapParam; -struct HeapParam { - u32 size; - OSArenaId arena; -}; - -void InitHeapSystem(const struct HeapParam *templates, u32 nTemplates, u32 totalNumHeaps, u32 pre_size); -s32 FindFirstAvailableHeapHandle(void); -BOOL CreateHeap(u32 parent, u32 child, u32 size); -BOOL CreateHeapAtEnd(u32 parent, u32 child, u32 size); -BOOL CreateHeapInternal(u32 parent, u32 child, u32 size, s32 alignment); -void DestroyHeap(HeapID heapId); -void *AllocFromHeapInternal(NNSFndHeapHandle heap, u32 size, s32 alignment, HeapID heapId); -void AllocFail(void); -void *AllocFromHeap(HeapID heapId, u32 size); -void *AllocFromHeapAtEnd(HeapID heapId, u32 size); -void FreeToHeap(void *ptr); -void FreeToHeapExplicit(HeapID heapId, void *ptr); -u32 GF_ExpHeap_FndGetTotalFreeSize(HeapID heapId); -void GF_ExpHeap_FndInitAllocator(NNSFndAllocator *pAllocator, HeapID heapId, int alignment); -void ReallocFromHeap(void *ptr, u32 newSize); -BOOL GF_heap_c_dummy_return_true(HeapID heapId); +void Heap_InitSystem(const HeapParam *templates, u32 nTemplates, u32 totalNumHeaps, u32 preSize); +BOOL Heap_Create(enum HeapID parent, enum HeapID child, u32 size); +BOOL Heap_CreateAtEnd(enum HeapID parent, enum HeapID child, u32 size); +void Heap_Destroy(enum HeapID heapID); +void *Heap_Alloc(enum HeapID heapID, u32 size); +void *Heap_AllocAtEnd(enum HeapID heapID, u32 size); +void Heap_Free(void *ptr); +void Heap_FreeExplicit(enum HeapID heapID, void *ptr); +u32 HeapExp_FndGetTotalFreeSize(enum HeapID heapID); +void HeapExp_FndInitAllocator(NNSFndAllocator *pAllocator, enum HeapID heapID, int alignment); +void Heap_Realloc(void *ptr, u32 newSize); +BOOL GF_heap_c_dummy_return_true(enum HeapID heapID); #endif // POKEDIAMOND_HEAP_H diff --git a/include/itemtool.h b/include/itemtool.h index 909d6db63..8c20c5311 100644 --- a/include/itemtool.h +++ b/include/itemtool.h @@ -97,10 +97,10 @@ u16 GetItemIndexMapping(u16 a0, u16 a1); u16 UpConvertItemId_Gen3to4(u16 a0); int sub_0206E708(); int sub_0206E70C(); -void *LoadItemDataOrGfx(u16 itemId, u16 which, HeapID heapId); -void GetItemNameIntoString(struct String *dest, u16 item_id, HeapID heapId); -void GetItemDescIntoString(struct String *dest, u16 item_id, HeapID heapId); -u32 GetItemAttr(u16 item, u32 attr, HeapID heapId); +void *LoadItemDataOrGfx(u16 itemId, u16 which, enum HeapID heapID); +void GetItemNameIntoString(struct String *dest, u16 item_id, enum HeapID heapID); +void GetItemDescIntoString(struct String *dest, u16 item_id, enum HeapID heapID); +u32 GetItemAttr(u16 item, u32 attr, enum HeapID heapID); u32 GetItemAttr_PreloadedItemData(struct ItemData *itemData, u32 attr); u32 GetItemAttrSub(struct ItemPartyUseParam *sub, u32 attr); u16 TMHMGetMove(u16 a0); @@ -113,7 +113,7 @@ BOOL ItemIdIsBerry(u16 item_id); u8 ItemToBerryId(u16 item_id); u16 BerryToItemId(u8 a0); u8 ItemIsBitter(u16 item_id); -struct ItemData *LoadAllItemData(HeapID heapId); +struct ItemData *LoadAllItemData(enum HeapID heapID); struct ItemData *GetItemDataPtrFromArray(struct ItemData *a0, u16 item_id); #endif // POKEDIAMOND_ITEMTOOL_H diff --git a/include/list_menu.h b/include/list_menu.h index da53d1c7e..c131c0b30 100644 --- a/include/list_menu.h +++ b/include/list_menu.h @@ -60,10 +60,10 @@ struct ListMenu { /*0x31*/ u8 unk_31; /*0x32*/ u8 taskId; /*0x33*/ u8 unk_33; - /*0x34*/ u8 heapId; + /*0x34*/ u8 heapID; }; -struct ListMenu *ListMenuInit(const struct ListMenuTemplate *template, u16 cursorPos, u16 itemsAbove, u8 heapId); +struct ListMenu *ListMenuInit(const struct ListMenuTemplate *template, u16 cursorPos, u16 itemsAbove, u8 heapID); s32 ListMenu_ProcessInput(struct ListMenu *list); void DestroyListMenu(struct ListMenu *list, u16 *cursorPos, u16 *itemsAbove); void RedrawListMenu(struct ListMenu *list); diff --git a/include/list_menu_cursor.h b/include/list_menu_cursor.h index 6503d0fba..0a1d2e811 100644 --- a/include/list_menu_cursor.h +++ b/include/list_menu_cursor.h @@ -8,7 +8,7 @@ struct ListMenuCursor { // ??? }; -extern struct ListMenuCursor *ListMenuCursorNew(HeapID heapId); +extern struct ListMenuCursor *ListMenuCursorNew(enum HeapID heapID); extern void ListMenuUpdateCursorObj(struct ListMenuCursor *, struct Window *, u8 x, u8 y); extern void ListMenuCursorSetColor(struct ListMenuCursor *, u32); extern void DestroyListMenuCursorObj(struct ListMenuCursor *); diff --git a/include/list_menu_items.h b/include/list_menu_items.h index 4a98b63ea..9b9189f8b 100644 --- a/include/list_menu_items.h +++ b/include/list_menu_items.h @@ -9,12 +9,12 @@ struct ListMenuItem { s32 value; }; -struct ListMenuItem *ListMenuItems_New(u32 count, HeapID heapId); +struct ListMenuItem *ListMenuItems_New(u32 count, enum HeapID heapID); void ListMenuItems_Delete(struct ListMenuItem *items); void ListMenuItems_AppendFromMsgData(struct ListMenuItem *items, struct MsgData *msgData, u32 msgNo, s32 value); void ListMenuItems_AddItem(struct ListMenuItem *items, struct String *str, s32 value); void ListMenuItems_CopyItem(struct ListMenuItem *items, struct ListMenuItem *src); -struct ListMenuItem *ListMenuItems_SeekEnd(struct ListMenuItem *items, HeapID *heapIdPtr); +struct ListMenuItem *ListMenuItems_SeekEnd(struct ListMenuItem *items, enum HeapID *heapIdPtr); void ListMenuItems_DestroyMenuStrings(struct ListMenuItem *items); #endif // POKEDIAMOND_LIST_MENU_ITEMS_H diff --git a/include/mail.h b/include/mail.h index 99a60f0e5..0da536915 100644 --- a/include/mail.h +++ b/include/mail.h @@ -25,11 +25,11 @@ typedef struct Mail { struct MailMessage unk_20[3]; } Mail; -struct Mail *Mail_New(HeapID heapId); +struct Mail *Mail_New(enum HeapID heapID); void Mail_Init(struct Mail *mail); BOOL Mail_TypeIsValid(struct Mail *mail); -struct Mail *Mail_New(HeapID heapId); +struct Mail *Mail_New(enum HeapID heapID); void Mail_Copy(const struct Mail *src, struct Mail *dest); void Mail_SetNewMessageDetails(struct Mail *mail, u8 type, u8 monIdx, struct SaveData *save); u32 Mail_GetOTID(struct Mail *mail); @@ -49,7 +49,7 @@ s32 Mailbox_GetFirstEmptySlotIdx(struct Mail *mail, BOOL r1); void Mailbox_DeleteSlotI(struct Mail *mail, BOOL r1, s32 idx); void Mailbox_CopyMailToSlotI(struct Mail *mail, BOOL r1, s32 idx, const struct Mail *src); s32 Mailbox_CountMessages(struct Mail *mail, BOOL r1); -struct Mail *Mailbox_AllocAndFetchMailI(struct Mail *mail, BOOL r1, s32 idx, HeapID heapId); +struct Mail *Mailbox_AllocAndFetchMailI(struct Mail *mail, BOOL r1, s32 idx, enum HeapID heapID); void Mailbox_FetchMailIToBuffer(struct Mail *mail, BOOL r1, s32 idx, struct Mail *dest); s32 MailArray_GetFirstEmptySlotIdx(struct Mail *mail, s32 count); s32 MailArray_CountMessages(struct Mail *mail, s32 count); diff --git a/include/mail_message.h b/include/mail_message.h index aa8746114..36d4899df 100644 --- a/include/mail_message.h +++ b/include/mail_message.h @@ -16,8 +16,8 @@ void MailMsg_Init(struct MailMessage *mailMsg); void MailMsg_Init_WithBank(struct MailMessage *mailMsg, u16 bank); void MailMsg_Init_Default(struct MailMessage *mailMsg); void MailMsg_Init_FromTemplate(struct MailMessage *mailMsg, u32 a1); -struct String *MailMsg_GetExpandedString(struct MailMessage *mailMsg, HeapID heapId); -struct String *MailMsg_GetRawString(struct MailMessage *mailMsg, HeapID heapId); +struct String *MailMsg_GetExpandedString(struct MailMessage *mailMsg, enum HeapID heapID); +struct String *MailMsg_GetRawString(struct MailMessage *mailMsg, enum HeapID heapID); BOOL MailMsg_IsInit(struct MailMessage *mailMsg); BOOL MailMsg_AllFieldsAreInit(struct MailMessage *mailMsg); u32 MailMsg_NumFields(u16 bank, u16 num); diff --git a/include/map_matrix.h b/include/map_matrix.h index 586879d82..1e1b8292e 100644 --- a/include/map_matrix.h +++ b/include/map_matrix.h @@ -41,7 +41,7 @@ u8 MapMatrix_GetMatrixID(struct MapMatrix *map_matrix); u32 MapMatrix_GetMapAltitude( struct MapMatrix *map_matrix, u8 param1, s16 x, s16 y, int matrix_width); -struct MapData *MapMatrix_MapData_New(HeapID heapId); +struct MapData *MapMatrix_MapData_New(enum HeapID heapID); void MapMatrix_MapData_Free(struct MapData *map_data); u16 MapMatrix_MapData_GetData(struct MapData *map_data, s32 x, s32 y); diff --git a/include/message_format.h b/include/message_format.h index 2ac181f8d..8d6b46cbf 100644 --- a/include/message_format.h +++ b/include/message_format.h @@ -17,7 +17,7 @@ typedef struct MessageFormatFields { typedef struct MessageFormat { u32 count; - HeapID heapId; + enum HeapID heapID; MessageFormatFields *fields; struct String *buffer; } MessageFormat; @@ -29,8 +29,8 @@ struct UnkStruct_0200B870 { u32 unk_28; }; -MessageFormat *MessageFormat_New(HeapID heapId); -MessageFormat *MessageFormat_New_Custom(u32 nstr, u32 strlen, HeapID heapId); +MessageFormat *MessageFormat_New(enum HeapID heapID); +MessageFormat *MessageFormat_New_Custom(u32 nstr, u32 strlen, enum HeapID heapID); void MessageFormat_Delete(MessageFormat *messageFormat); void MessageFormat_InitFields(MessageFormatFields *fields); void SetStringAsPlaceholder(MessageFormat *messageFormat, u32 idx, struct String *str, MessageFormatAttrs *attrs); @@ -93,7 +93,7 @@ void BufferMonthNameAbbr(MessageFormat *messageFormat, u32 idx, u32 month); void MessageFormat_UpperFirstChar(MessageFormat *messageFormat, u32 idx); void StringExpandPlaceholders(MessageFormat *messageFormat, struct String *dest, struct String *src); void MessageFormat_ResetBuffers(MessageFormat *messageFormat); -struct UnkStruct_0200B870 *MessagePrinter_New(u32 color1, u32 color2, u32 color3, HeapID heapId); +struct UnkStruct_0200B870 *MessagePrinter_New(u32 color1, u32 color2, u32 color3, enum HeapID heapID); void MessagePrinter_Delete(struct UnkStruct_0200B870 *a0); void sub_0200B9A8(struct UnkStruct_0200B870 *a0, int a1, struct Window *a2, int a3, int a4); void sub_0200B9EC(struct UnkStruct_0200B870 *string, u32 value, u32 n, enum PrintingMode mode, struct Window *window, int x, int y); diff --git a/include/move_relearner.h b/include/move_relearner.h index f4961b23e..d5f691a28 100644 --- a/include/move_relearner.h +++ b/include/move_relearner.h @@ -15,9 +15,9 @@ typedef struct MoveRelearner { u8 padding2[1]; } MoveRelearner; -MoveRelearner *MoveRelearner_New(HeapID heapId); +MoveRelearner *MoveRelearner_New(enum HeapID heapID); void MoveRelearner_Delete(MoveRelearner *moveRelearner); -u16 *MoveRelearner_GetEligibleLevelUpMoves(Pokemon *mon, HeapID heapId); +u16 *MoveRelearner_GetEligibleLevelUpMoves(Pokemon *mon, enum HeapID heapID); BOOL MoveRelearner_IsValidMove(const u16 *ptr); #endif // POKEDIAMOND_MOVE_RELEARNER_H diff --git a/include/msgdata.h b/include/msgdata.h index 02e3d0eb3..3f95bd6e8 100644 --- a/include/msgdata.h +++ b/include/msgdata.h @@ -23,7 +23,7 @@ struct MsgDataTable { typedef struct MsgData { u16 type; - u16 heapId; + u16 heapID; u16 narc_id; u16 file_id; union { @@ -32,17 +32,17 @@ typedef struct MsgData { } data; } MsgData; -void ReadMsgData_NewNarc_ExistingString(NarcId narc_id, u32 group, u32 num, HeapID heapId, struct String *dest); -struct MsgData *NewMsgDataFromNarc(MsgDataLoadType type, NarcId narcId, s32 msgId, HeapID heapId); +void ReadMsgData_NewNarc_ExistingString(NarcId narc_id, u32 group, u32 num, enum HeapID heapID, struct String *dest); +struct MsgData *NewMsgDataFromNarc(MsgDataLoadType type, NarcId narcId, s32 msgId, enum HeapID heapID); void DestroyMsgData(struct MsgData *); -struct String *ReadMsgData_NewNarc_NewString(NarcId narc_id, u32 group, u32 num, HeapID heapId); +struct String *ReadMsgData_NewNarc_NewString(NarcId narc_id, u32 group, u32 num, enum HeapID heapID); void ReadMsgDataIntoString(struct MsgData *msgData, u32 msg_no, struct String *dest); struct String *NewString_ReadMsgData(struct MsgData *, u32); u16 MsgDataGetCount(struct MsgData *msgData); void ReadMsgDataIntoU16Array(struct MsgData *msgData, u32 msg_no, u16 *dest); -void GetSpeciesNameIntoArray(u16 species, HeapID heapId, u16 *dest); -struct String *ReadMsgData_ExpandPlaceholders(MessageFormat *messageFormat, struct MsgData *msgData, u32 msgno, HeapID heapId); -struct String *GetMoveName(u32 move, HeapID heapId); -struct String *GetSpeciesName(u16 species, HeapID heapId); +void GetSpeciesNameIntoArray(u16 species, enum HeapID heapID, u16 *dest); +struct String *ReadMsgData_ExpandPlaceholders(MessageFormat *messageFormat, struct MsgData *msgData, u32 msgno, enum HeapID heapID); +struct String *GetMoveName(u32 move, enum HeapID heapID); +struct String *GetSpeciesName(u16 species, enum HeapID heapID); #endif // POKEDIAMOND_MSG_DATA_H diff --git a/include/nutdata.h b/include/nutdata.h index 64d186053..6d5d96261 100644 --- a/include/nutdata.h +++ b/include/nutdata.h @@ -23,13 +23,13 @@ struct NutData { u8 smoothness; }; -NARC *OpenNutsDataNarc(HeapID heapId); -struct NutData *ReadNutDataFromNarc(NARC *narc, u32 berry_idx, HeapID heapId); +NARC *OpenNutsDataNarc(enum HeapID heapID); +struct NutData *ReadNutDataFromNarc(NARC *narc, u32 berry_idx, enum HeapID heapID); void CloseNutsDataNarc(NARC *narc); -struct NutData *LoadNutDataSingle(s32 berry_idx, HeapID heapId); -struct NutData *LoadNutDataSingleByItemId(s32 item_id, HeapID heapId); +struct NutData *LoadNutDataSingle(s32 berry_idx, enum HeapID heapID); +struct NutData *LoadNutDataSingleByItemId(s32 item_id, enum HeapID heapID); u32 GetNutAttr(struct NutData *nut, u32 attr); -struct String *GetNutName(u32 berry_idx, HeapID heapId); -struct String *GetNutDesc(u32 berry_idx, HeapID heapId); +struct String *GetNutName(u32 berry_idx, enum HeapID heapID); +struct String *GetNutDesc(u32 berry_idx, enum HeapID heapID); #endif // POKEDIAMOND_NUTDATA_H diff --git a/include/oam.h b/include/oam.h index 5bc0b30da..99ebb235d 100644 --- a/include/oam.h +++ b/include/oam.h @@ -8,7 +8,7 @@ struct OamData { NNSG2dOamManager oamManagers[2]; - HeapID heapId; + enum HeapID heapID; }; void sub_02009EAC(s32 param0, @@ -19,7 +19,7 @@ void sub_02009EAC(s32 param0, u32 param5, u32 param6, u32 param7, - HeapID heapId); + enum HeapID heapID); void InitOamData(s32 param0, s32 param1, s32 param2, @@ -28,13 +28,13 @@ void InitOamData(s32 param0, u32 param5, u32 param6, u32 param7, - HeapID heapId); + enum HeapID heapID); void ApplyAndResetOamManagerBuffer(void); void DeinitOamData(void); void sub_02009FD8(void *param0, u32 *param1, u32 param2, u32 param3); NNSG2dOamManager *GetOamManager(u32 screen); -void sub_0200A064(HeapID heapId); -void sub_0200A06C(HeapID heapId); +void sub_0200A064(enum HeapID heapID); +void sub_0200A06C(enum HeapID heapID); u32 EntryOamManagerOamWithAffineIdxMainScreen(u32 param0, u32 param1); u32 EntryOamManagerOamWithAffineIdxSubScreen(u32 param0, u32 param1); u32 EntryOamManagerAffineMainScreen(u32 param0); diff --git a/include/options.h b/include/options.h index b26636285..7f94afdc7 100644 --- a/include/options.h +++ b/include/options.h @@ -14,7 +14,7 @@ typedef struct Options { u16 frame : 5; } Options; -struct Options *Options_New(HeapID heapId); +struct Options *Options_New(enum HeapID heapID); void Options_Copy(struct Options *src, struct Options *dest); void Options_Init(struct Options *options); void Options_SetButtonModeOnMain(struct SaveData *save, u32 buttonMode); diff --git a/include/overlay_manager.h b/include/overlay_manager.h index 605b7ee66..a5f70495b 100644 --- a/include/overlay_manager.h +++ b/include/overlay_manager.h @@ -25,9 +25,9 @@ struct OverlayManager { u32 unk24; }; -struct OverlayManager *OverlayManager_New(const struct OverlayManagerTemplate *template, s32 *a1, HeapID heapId); +struct OverlayManager *OverlayManager_New(const struct OverlayManagerTemplate *template, s32 *a1, enum HeapID heapID); void OverlayManager_Delete(struct OverlayManager *overlayManager); -void *OverlayManager_CreateAndGetData(struct OverlayManager *overlayManager, u32 size, HeapID heapId); +void *OverlayManager_CreateAndGetData(struct OverlayManager *overlayManager, u32 size, enum HeapID heapID); void *OverlayManager_GetData(struct OverlayManager *overlayManager); void OverlayManager_FreeData(struct OverlayManager *overlayManager); s32 *OverlayManager_GetField18(struct OverlayManager *overlayManager); diff --git a/include/palette.h b/include/palette.h index 22d2474f0..389e558e8 100644 --- a/include/palette.h +++ b/include/palette.h @@ -48,18 +48,18 @@ struct PaletteData { u16 unk11e; }; -struct PaletteData *sub_02002FD0(HeapID heapId); +struct PaletteData *sub_02002FD0(enum HeapID heapID); void sub_02002FEC(struct PaletteData *ptr); void PaletteData_SetBuffers( struct PaletteData *paletteData, u32 index, void *unfadedBuf, void *fadedBuf, u32 size); -void PaletteData_AllocBuffers(struct PaletteData *paletteData, u32 index, u32 size, HeapID heapId); +void PaletteData_AllocBuffers(struct PaletteData *paletteData, u32 index, u32 size, enum HeapID heapID); void PaletteData_FreeBuffers(struct PaletteData *paletteData, u32 index); void PaletteData_LoadPalette( struct PaletteData *paletteData, const void *src, u32 index, u32 offset, u16 size); void PaletteData_LoadFromNarc(struct PaletteData *paletteData, NarcId narcId, s32 memberId, - HeapID heapId, + enum HeapID heapID, u32 index, u32 size, u16 offset, @@ -67,13 +67,13 @@ void PaletteData_LoadFromNarc(struct PaletteData *paletteData, void PaletteData_LoadNarc(struct PaletteData *paletteData, NarcId narcId, s32 memberId, - HeapID heapId, + enum HeapID heapID, u32 index, u32 size, u16 offset); void sub_02003108(struct PaletteData *paletteData, u32 index, u16 offset, u32 size); void CopyPaletteFromNarc( - NarcId narcId, s32 memberId, HeapID heapId, u32 size, u16 offset, void *dest); + NarcId narcId, s32 memberId, enum HeapID heapID, u32 size, u16 offset, void *dest); void PaletteData_CopyPalette(struct PaletteData *paletteData, u32 srcIdx, u16 srcOffset, @@ -128,7 +128,7 @@ void TintPalette_CustomTone(u16 *palette, s32 count, s32 rTone, s32 gTone, s32 b void sub_02003B40(struct PaletteData *paletteData, NarcId narcId, s32 memberId, - HeapID heapId, + enum HeapID heapID, u32 index, u32 size, u16 offset, diff --git a/include/party.h b/include/party.h index b07fe2650..8d8e9552b 100644 --- a/include/party.h +++ b/include/party.h @@ -8,7 +8,7 @@ BOOL Party_HasMon(struct Party *party_p, u16 species); int Party_GetCount(struct Party *party_p); struct Pokemon *Party_GetMonByIndex(struct Party *party_p, int idx); u32 SaveArray_Party_sizeof(void); -struct Party *SaveArray_Party_Alloc(HeapID heapId); +struct Party *SaveArray_Party_Alloc(enum HeapID heapID); void SaveArray_Party_Init(struct Party *party); void Party_InitWithMaxSize(struct Party *party, int count); BOOL Party_AddMon(struct Party *party, struct Pokemon *pokemon); diff --git a/include/player_data.h b/include/player_data.h index 18d4f5409..c4e3a1e86 100644 --- a/include/player_data.h +++ b/include/player_data.h @@ -40,14 +40,14 @@ struct Options *Save_PlayerData_GetOptionsAddr(struct SaveData *save); u16 *Save_PlayerData_GetCoinsAddr(struct SaveData *save); struct IGT *Save_PlayerData_GetIGTAddr(struct SaveData *save); u32 PlayerProfile_sizeof(void); -PlayerProfile *PlayerProfile_New(HeapID heapId); +PlayerProfile *PlayerProfile_New(enum HeapID heapID); void PlayerProfile_Copy(const PlayerProfile *src, PlayerProfile *dest); void PlayerProfile_Init(PlayerProfile *data); void CopyPlayerName(u16 *dest, PlayerProfile *data); void PlayerName_StringToFlat(PlayerProfile *data, struct String *str); u16 *PlayerProfile_GetNamePtr(PlayerProfile *data); void PlayerName_FlatToString(PlayerProfile *data, struct String *str); -struct String *PlayerProfile_GetPlayerName_NewString(PlayerProfile *data, HeapID heapId); +struct String *PlayerProfile_GetPlayerName_NewString(PlayerProfile *data, enum HeapID heapID); void PlayerProfile_SetTrainerID(PlayerProfile *playerProfile, u32 otid); u32 PlayerProfile_GetTrainerID(PlayerProfile *data); u16 PlayerProfile_GetTrainerID_VisibleHalf(PlayerProfile *data); diff --git a/include/pokedex.h b/include/pokedex.h index c163efb3b..64a489ce7 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -27,7 +27,7 @@ typedef struct Pokedex { } Pokedex; u32 Save_Pokedex_sizeof(void); -struct Pokedex *Save_Pokedex_New(HeapID heapId); +struct Pokedex *Save_Pokedex_New(enum HeapID heapID); void Save_Pokedex_Copy(const struct Pokedex *src, struct Pokedex *dest); s32 Pokedex_CountSeenShellosOrGastrodon_Internal(struct Pokedex *pokedex, u32 species); BOOL Pokedex_HasSeenShellosOrGastrodonForm(struct Pokedex *pokedex, u32 species, u8 state); diff --git a/include/pokemon.h b/include/pokemon.h index f60cf59ff..6fa3d484b 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -208,7 +208,7 @@ typedef struct Party { void ZeroMonData(struct Pokemon *pokemon); void ZeroBoxMonData(struct BoxPokemon *boxmon); u32 SizeOfStructPokemon(void); -struct Pokemon *AllocMonZeroed(HeapID heapId); +struct Pokemon *AllocMonZeroed(enum HeapID heapID); BOOL AcquireMonLock(struct Pokemon *mon); BOOL ReleaseMonLock(struct Pokemon *mon, BOOL decrypt_result); BOOL AcquireBoxMonLock(struct BoxPokemon *mon); @@ -231,7 +231,7 @@ u32 GetBoxMonData(struct BoxPokemon *pokemon, int attr, void *ptr); void SetMonData(struct Pokemon *pokemon, int attr, void *ptr); void SetBoxMonData(struct BoxPokemon *pokemon, int attr, void *ptr); void AddMonData(struct Pokemon *pokemon, int attr, int amount); -struct BaseStats *AllocAndLoadMonPersonal(int species, HeapID heapId); +struct BaseStats *AllocAndLoadMonPersonal(int species, enum HeapID heapID); int GetPersonalAttr(struct BaseStats *baseStats, enum BaseStat attr); void FreeMonPersonal(struct BaseStats *personal); int GetMonBaseStat_HandleFormConversion(int species, int form, enum BaseStat stat_id); @@ -301,8 +301,8 @@ void Party_SpreadPokerus(struct Party *party); BOOL Pokemon_HasPokerus(struct Pokemon *pokemon); BOOL Pokemon_IsImmuneToPokerus(struct Pokemon *pokemon); void Pokemon_UpdateArceusForm(struct Pokemon *pokemon); -void sub_02069FB0(struct SaveChatotSoundClip *r7, u32 r5, u16 r4, s32 r6, s32 sp18, u32 sp1C, HeapID heapId); -void sub_0206A014(struct Pokemon *pokemon, PlayerProfile *a1, u32 pokeball, u32 a3, u32 encounterType, HeapID heapId); +void sub_02069FB0(struct SaveChatotSoundClip *r7, u32 r5, u16 r4, s32 r6, s32 sp18, u32 sp1C, enum HeapID heapID); +void sub_0206A014(struct Pokemon *pokemon, PlayerProfile *a1, u32 pokeball, u32 a3, u32 encounterType, enum HeapID heapID); void sub_0206A094(struct Pokemon *pokemon, u32 a1, u32 a2); BOOL sub_0206A13C(struct Pokemon *pokemon, u32 a1); void sub_0206A1C4(struct Pokemon *pokemon); @@ -311,7 +311,7 @@ int LowestFlagNo(u32 mask); BOOL IsPokemonLegendaryOrMythical(u16 species); u16 GetLegendaryMon(u32 idx); BOOL sub_0206A998(struct Pokemon *pokemon); -BOOL sub_0206A9AC(struct BoxPokemon *boxmon, PlayerProfile *sb2, HeapID heapId); +BOOL sub_0206A9AC(struct BoxPokemon *boxmon, PlayerProfile *sb2, enum HeapID heapID); void Pokemon_RemoveCapsule(struct Pokemon *pokemon); void RestoreBoxMonPP(struct BoxPokemon *boxmon); diff --git a/include/render_window.h b/include/render_window.h index a89009078..4ab58ae04 100644 --- a/include/render_window.h +++ b/include/render_window.h @@ -44,9 +44,9 @@ struct UnkStruct_0200CABC_3 { u32 unk0c; }; -u32 sub_0200CABC(struct BgConfig *bgConfig, u32 layer, u32 numTiles, u32 param3, HeapID heapId); +u32 sub_0200CABC(struct BgConfig *bgConfig, u32 layer, u32 numTiles, u32 param3, enum HeapID heapID); s32 sub_0200CAFC(void); -void LoadUserFrameGfx1(struct BgConfig *bg_config, enum GFBgLayer layer, u32 num_tiles, u32 paletteNumber, u8 frame_id, HeapID heapId); +void LoadUserFrameGfx1(struct BgConfig *bg_config, enum GFBgLayer layer, u32 num_tiles, u32 paletteNumber, u8 frame_id, enum HeapID heapID); void DrawFrame1(struct BgConfig *bgConfig, u8 bgId, u8 x, @@ -59,7 +59,7 @@ void DrawFrameAndWindow1(struct Window *window, BOOL copy_to_vram, u16 fill_valu void ClearFrameAndWindow1(struct Window *window, BOOL copy_to_vram); s32 sub_0200CD60(s32 param0); s32 sub_0200CD64(s32 param0); -void sub_0200CD68(struct BgConfig *bg_config, u32 layer, u32 num_tiles, u32 palNumber, u8 frame_id, HeapID heapId); +void sub_0200CD68(struct BgConfig *bg_config, u32 layer, u32 num_tiles, u32 palNumber, u8 frame_id, enum HeapID heapID); void DrawFrame2(struct BgConfig *bgConfig, u8 bgId, u8 x, u8 y, u8 width, u8 height, u8 paletteNum, u16 fillValue); void DrawWindowFrame2(struct Window *window, u32 fill_value, u32 palette_num); void DrawFrameAndWindow2(struct Window *window, BOOL copy_to_vram, u16 fill_value, u8 palette_num); @@ -77,15 +77,15 @@ void BlitRect4Bit(u8 *srcPixels, u16 width, u16 height); void sub_0200D18C(struct Window *window, u16 fill_value); -void sub_0200D274(struct BgConfig *bg_config, u8 bg_id, u16 param2, u8 param3, u8 param4, HeapID heapId); // todo: LoadUserFrameGfx1? +void sub_0200D274(struct BgConfig *bg_config, u8 bg_id, u16 param2, u8 param3, u8 param4, enum HeapID heapID); // todo: LoadUserFrameGfx1? void sub_0200D300(struct BgConfig *bg_config, u8 bg_id, u16 numtiles, u8 param3, u8 param4, u16 param5, - HeapID heapId); -void sub_0200D378(struct BgConfig *bg_config, u8 bg_id, u16 numtiles, u8 param3, u16 param4, HeapID heapId); // todo: LoadUserFrameGfx2? + enum HeapID heapID); +void sub_0200D378(struct BgConfig *bg_config, u8 bg_id, u16 numtiles, u8 param3, u16 param4, enum HeapID heapID); // todo: LoadUserFrameGfx2? void DrawFrame3(struct BgConfig *bgConfig, u8 bgId, u8 x, @@ -103,11 +103,11 @@ void sub_0200DB7C(SysTask *sysTask, void *param1); void sub_0200DBE8(SysTask *sysTask, void *param1); void sub_0200DBFC(WaitingIcon *waitingIcon); void sub_0200DC24(WaitingIcon *waitingIcon); -PokepicManager *DrawPokemonPicFromSpecies(struct BgConfig *bg_config, u8 bg_id, u8 param2, u8 param3, u8 param4, u16 numTiles, u16 species, u8 gender, HeapID heapId); -PokepicManager *DrawPokemonPicFromMon(struct BgConfig *bg_config, u8 bg_id, u8 param2, u8 param3, u8 param4, u16 numTiles, struct Pokemon *mon, HeapID heapId); +PokepicManager *DrawPokemonPicFromSpecies(struct BgConfig *bg_config, u8 bg_id, u8 param2, u8 param3, u8 param4, u16 numTiles, u16 species, u8 gender, enum HeapID heapID); +PokepicManager *DrawPokemonPicFromMon(struct BgConfig *bg_config, u8 bg_id, u8 param2, u8 param3, u8 param4, u16 numTiles, struct Pokemon *mon, enum HeapID heapID); void sub_0200DCF8(SysTask *task, void *param1); -struct UnkStruct_0200CABC_2 *sub_0200DD70(struct BgConfig *bg_config, u8 bg_id, u8 param2, u8 param3, HeapID heapId); -void sub_0200DDAC(struct UnkStruct_0200CABC_2 *param0, HeapID heapId); +struct UnkStruct_0200CABC_2 *sub_0200DD70(struct BgConfig *bg_config, u8 bg_id, u8 param2, u8 param3, enum HeapID heapID); +void sub_0200DDAC(struct UnkStruct_0200CABC_2 *param0, enum HeapID heapID); void sub_0200DDD8(struct UnkStruct_0200CABC_2 *param0); void sub_0200DE30(struct UnkStruct_0200CABC_2 *param0, u8 param1, u8 param2); void sub_0200DE80(struct UnkStruct_0200CABC_2 *param0, u16 param1, u8 param2); diff --git a/include/sav_chatot.h b/include/sav_chatot.h index eaa469529..2bd67685e 100644 --- a/include/sav_chatot.h +++ b/include/sav_chatot.h @@ -11,7 +11,7 @@ typedef struct SaveChatotSoundClip { u32 Save_Chatot_sizeof(void); void Save_Chatot_Init(struct SaveChatotSoundClip *chatot); -struct SaveChatotSoundClip *Chatot_New(HeapID heapId); +struct SaveChatotSoundClip *Chatot_New(enum HeapID heapID); struct SaveChatotSoundClip *Save_Chatot_Get(struct SaveData *save); BOOL Chatot_Exists(struct SaveChatotSoundClip *chatot); void Chatot_Invalidate(struct SaveChatotSoundClip *chatot); diff --git a/include/save.h b/include/save.h index c41b4464a..1c1ca6c67 100644 --- a/include/save.h +++ b/include/save.h @@ -141,7 +141,7 @@ void CreateChunkFooter(struct SaveData *save, u8 *data, int id, u32 size); BOOL ValidateChunk(struct SaveData *save, u8 *data, int id, u32 size); u32 sub_020232B4(u8 *data, u32 size); int WriteSaveFileToFlash(struct SaveData *save, int idx, u8 *data); -u8 *ReadSaveFileFromFlash(struct SaveData *save, HeapID heapId, int idx, int *ret_p); +u8 *ReadSaveFileFromFlash(struct SaveData *save, enum HeapID heapID, int idx, int *ret_p); BOOL SaveDetectFlash(void); int FlashWriteChunk(u32 offset, u8 *data, u32 size); BOOL FlashLoadChunk(u32 src, void *dest, u32 size); diff --git a/include/save_data_read_error.h b/include/save_data_read_error.h index 297ad7d45..410f55f7e 100644 --- a/include/save_data_read_error.h +++ b/include/save_data_read_error.h @@ -3,7 +3,7 @@ #include "heap.h" -void ShowSaveDataReadError(HeapID heapId); -void ShowGBACartRemovedError(HeapID heapId); +void ShowSaveDataReadError(enum HeapID heapID); +void ShowGBACartRemovedError(enum HeapID heapID); #endif diff --git a/include/save_data_write_error.h b/include/save_data_write_error.h index 63046009b..ff5085a0b 100644 --- a/include/save_data_write_error.h +++ b/include/save_data_write_error.h @@ -5,6 +5,6 @@ #include "heap.h" -void ShowSaveDataWriteError(HeapID heapId, u32 err_no); +void ShowSaveDataWriteError(enum HeapID heapID, u32 err_no); #endif diff --git a/include/script_pokemon_util.h b/include/script_pokemon_util.h index b47844d9b..ae3548e0b 100644 --- a/include/script_pokemon_util.h +++ b/include/script_pokemon_util.h @@ -4,8 +4,8 @@ #include "party.h" BOOL MonNotFaintedOrEgg(struct Pokemon *pokemon); -BOOL GiveMon(HeapID heapId, struct SaveData *save, u16 species, u8 level, u16 item, u32 mapSec, u32 encounterType); -BOOL GiveEgg(HeapID heapId, struct SaveData *save, u16 species, int level, int metLocIndex, int a3); +BOOL GiveMon(enum HeapID heapID, struct SaveData *save, u16 species, u8 level, u16 item, u32 mapSec, u32 encounterType); +BOOL GiveEgg(enum HeapID heapID, struct SaveData *save, u16 species, int level, int metLocIndex, int a3); void PartyMonSetMoveInSlot(struct Party *party, int partySlot, int moveSlot, u16 move); int GetIdxOfFirstPartyMonWithMove(struct Party *party, int move); int CountAlivePokemon(struct Party *party); diff --git a/include/string16.h b/include/string16.h index 7e6b70901..8380407a5 100644 --- a/include/string16.h +++ b/include/string16.h @@ -14,11 +14,11 @@ typedef struct String { #define STR16_MAGIC 0xB6F8D2EC -struct String *String_New(u32 count, HeapID heapId); +struct String *String_New(u32 count, enum HeapID heapID); BOOL String_Compare(struct String *, struct String *); void CopyU16ArrayToStringN(struct String *, u16 *, u32); // copy void String_SetEmpty(struct String *); // set empty -struct String *StringDup(struct String *, HeapID heapId); +struct String *StringDup(struct String *, enum HeapID heapID); void String_Delete(struct String *str); void StringCopy(struct String *dest, struct String *src); void String16_FormatInteger(struct String *str, int num, u32 ndigits, enum PrintingMode printingMode, BOOL whichCharset); diff --git a/include/trainer_data.h b/include/trainer_data.h index 1ba141301..185ef8568 100644 --- a/include/trainer_data.h +++ b/include/trainer_data.h @@ -67,13 +67,13 @@ typedef struct Trainer { typedef struct BattleSetup BattleSetup; -void EnemyTrainerSet_Init(BattleSetup *setup, struct SaveData *r4, HeapID heapId); +void EnemyTrainerSet_Init(BattleSetup *setup, struct SaveData *r4, enum HeapID heapID); s32 TrainerData_GetAttr(u32 tr_idx, u32 attr_no); -BOOL TrainerMessageWithIdPairExists(u32 pos, u32 idx, HeapID heapId); -void GetTrainerMessageByIdPair(u32 pos, u32 idx, struct String *str, HeapID heapId); +BOOL TrainerMessageWithIdPairExists(u32 pos, u32 idx, enum HeapID heapID); +void GetTrainerMessageByIdPair(u32 pos, u32 idx, struct String *str, enum HeapID heapID); void TrainerData_ReadTrData(u32 idx, struct TrainerData *dest); void TrainerData_ReadTrPoke(u32 idx, union TrainerMon *dest); int TrainerClass_GetGenderOrTrainerCount(int a0); -void CreateNPCTrainerParty(BattleSetup *setup, s32 party_id, HeapID heapId); +void CreateNPCTrainerParty(BattleSetup *setup, s32 party_id, enum HeapID heapID); #endif // POKEDIAMOND_TRAINER_DATA_H diff --git a/include/unk_020040F4.h b/include/unk_020040F4.h index ed0b1b6d1..e16f2a82b 100644 --- a/include/unk_020040F4.h +++ b/include/unk_020040F4.h @@ -77,7 +77,7 @@ BOOL sub_02004ABC(u32 param0); void sub_02004ACC(u32 param0, u32 param1); void sub_02004AE4(u32 param0, u32 param1); void sub_02004AF8(u32 param0, s32 param1); -u32 sub_02004B30(u32 param0, s32 param1, s32 param2, u32 param3, HeapID heapId); +u32 sub_02004B30(u32 param0, s32 param1, s32 param2, u32 param3, enum HeapID heapID); void sub_02004C1C(u8 *param0, u32 param1); void sub_02004C3C(u32 param0); BOOL GF_SndCaptureIsActive(void); diff --git a/include/unk_020051F4.h b/include/unk_020051F4.h index 909e9bf7f..c755624fe 100644 --- a/include/unk_020051F4.h +++ b/include/unk_020051F4.h @@ -31,13 +31,13 @@ void sub_0200554C(u32 param0); u32 sub_02005578(u16 species); void sub_02005614(u32 param0); BOOL sub_02005670(); -u32 sub_020056AC(u32 param0, u16 param1, s32 param2, s32 param3, HeapID heapId); +u32 sub_020056AC(u32 param0, u16 param1, s32 param2, s32 param3, enum HeapID heapID); void sub_02005AC8(u32 param0, int playerNo, s32 param2); -void sub_02005AE0(u32 param0, HeapID heapId); +void sub_02005AE0(u32 param0, enum HeapID heapID); void sub_02005B2C(SysTask *param0, s32 *param1); void sub_02005BA0(); u32 sub_02005BC8(u16 param0, s32 param1); -void sub_02005BF8(u32 param0, s32 param1, s32 param2, s32 param3, HeapID heapId); +void sub_02005BF8(u32 param0, s32 param1, s32 param2, s32 param3, enum HeapID heapID); u32 PlaySound(u16 param0); BOOL sub_02005C74(); void sub_02005CA0(u32 param0); diff --git a/include/unk_020061E8.h b/include/unk_020061E8.h index 5f0cc2fcd..ed9b03466 100644 --- a/include/unk_020061E8.h +++ b/include/unk_020061E8.h @@ -6,7 +6,7 @@ #include "text.h" #include "unk_0200CA44.h" -SysTask *sub_020061E8(SysTaskFunc func, u32 r1, u32 r2, HeapID heapId); +SysTask *sub_020061E8(SysTaskFunc func, u32 r1, u32 r2, enum HeapID heapID); void sub_0200621C(SysTask *sysTask); #endif // POKEDIAMOND_UNK_020061E8_H diff --git a/include/unk_02006D98.h b/include/unk_02006D98.h index a54f3beba..6f43b1aed 100644 --- a/include/unk_02006D98.h +++ b/include/unk_02006D98.h @@ -94,7 +94,7 @@ struct UnkStruct_02006D98 { struct UnkStruct_02006D98_2 unk000[4]; NNSG2dImageProxy unk260; NNSG2dImagePaletteProxy unk284; - HeapID heapId; + enum HeapID heapID; u32 unk29C; u32 unk2A0; u32 unk2A4; @@ -125,7 +125,7 @@ struct UnkStruct_02006D98_5 { struct UnkStruct_02006D98_sub *unk10; }; -struct UnkStruct_02006D98 *sub_02006D98(HeapID heapId); +struct UnkStruct_02006D98 *sub_02006D98(enum HeapID heapID); void sub_02006ED4(struct UnkStruct_02006D98 *param0); void sub_020072E8(struct UnkStruct_02006D98 *param0); void sub_02007314(struct UnkStruct_02006D98_2 *param0); diff --git a/include/unk_02008AA4.h b/include/unk_02008AA4.h index 3176ed048..2e2b0811f 100644 --- a/include/unk_02008AA4.h +++ b/include/unk_02008AA4.h @@ -37,7 +37,7 @@ void sub_02008AA4(struct UnkStruct_0200BB14_sub *param0, struct UnkStruct_02008DEC_1 *param13, struct UnkStruct_02008DEC_1 *param14); struct UnkStruct_02008AA4_1 *sub_02008BE0(struct UnkStruct_02008AA4_2 *param0, - HeapID heapId, + enum HeapID heapID, struct UnkStruct_02008DEC_1 *param2, struct UnkStruct_02008DEC_1 *param3, struct UnkStruct_02008DEC_1 *param4, diff --git a/include/unk_02008DEC.h b/include/unk_02008DEC.h index 9a64cfbe2..7e0a5623d 100644 --- a/include/unk_02008DEC.h +++ b/include/unk_02008DEC.h @@ -72,26 +72,26 @@ struct AnimBank_02008DEC { NNSG2dAnimBankData *bankData; }; -struct UnkStruct_02008DEC_1 *sub_02008DEC(u32 param0, s32 param1, HeapID heapId); +struct UnkStruct_02008DEC_1 *sub_02008DEC(u32 param0, s32 param1, enum HeapID heapID); void sub_02008E2C(struct UnkStruct_02008DEC_1 *param0); struct UnkStruct_02008DEC_sub *sub_02008E6C(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_2 *param1, s32 param2, - HeapID heapId); + enum HeapID heapID); struct UnkStruct_02008DEC_sub *sub_02008F34(struct UnkStruct_02008DEC_1 *param0, NarcId param1, s32 param2, BOOL param3, s32 param4, u32 param5, - HeapID heapId); + enum HeapID heapID); struct UnkStruct_02008DEC_sub *sub_02008F90(struct UnkStruct_02008DEC_1 *param0, NarcId param1, s32 param2, BOOL param3, s32 param4, u32 param5, - HeapID heapId, + enum HeapID heapID, BOOL param7); struct UnkStruct_02008DEC_sub *sub_02008FEC(struct UnkStruct_02008DEC_1 *param0, NarcId param1, @@ -100,7 +100,7 @@ struct UnkStruct_02008DEC_sub *sub_02008FEC(struct UnkStruct_02008DEC_1 *param0, s32 param4, u32 param5, u32 param6, - HeapID heapId); + enum HeapID heapID); struct UnkStruct_02008DEC_sub *sub_0200904C(struct UnkStruct_02008DEC_1 *param0, NarcId param1, s32 param2, @@ -108,7 +108,7 @@ struct UnkStruct_02008DEC_sub *sub_0200904C(struct UnkStruct_02008DEC_1 *param0, s32 param4, u32 param5, u32 param6, - HeapID heapId, + enum HeapID heapID, BOOL param8); struct UnkStruct_02008DEC_sub *sub_020090AC(struct UnkStruct_02008DEC_1 *param0, NarcId param1, @@ -116,33 +116,33 @@ struct UnkStruct_02008DEC_sub *sub_020090AC(struct UnkStruct_02008DEC_1 *param0, BOOL param3, s32 param4, u32 param5, - HeapID heapId); + enum HeapID heapID); void sub_020090FC(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_sub *param1, NarcId param2, s32 param3, BOOL param4, - HeapID heapId); + enum HeapID heapID); void sub_02009168(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_sub *param1, NarcId param2, s32 param3, BOOL param4, - HeapID heapId); + enum HeapID heapID); struct UnkStruct_02008DEC_sub *sub_020091E0(struct UnkStruct_02008DEC_1 *param0, NARC *param1, u32 param2, u32 param3, s32 param4, u32 param5, - HeapID heapId); + enum HeapID heapID); struct UnkStruct_02008DEC_sub *sub_0200923C(struct UnkStruct_02008DEC_1 *param0, NARC *param1, u32 param2, u32 param3, s32 param4, u32 param5, - HeapID heapId, + enum HeapID heapID, u32 param7); struct UnkStruct_02008DEC_sub *sub_02009298(struct UnkStruct_02008DEC_1 *param0, NARC *param1, @@ -151,7 +151,7 @@ struct UnkStruct_02008DEC_sub *sub_02009298(struct UnkStruct_02008DEC_1 *param0, s32 param4, u32 param5, u32 param6, - HeapID heapId); + enum HeapID heapID); struct UnkStruct_02008DEC_sub *sub_020092F8(struct UnkStruct_02008DEC_1 *param0, NARC *param1, u32 param2, @@ -159,7 +159,7 @@ struct UnkStruct_02008DEC_sub *sub_020092F8(struct UnkStruct_02008DEC_1 *param0, s32 param4, u32 param5, u32 param6, - HeapID heapId, + enum HeapID heapID, u32 param8); struct UnkStruct_02008DEC_sub *sub_02009358(struct UnkStruct_02008DEC_1 *param0, NARC *param1, @@ -167,18 +167,18 @@ struct UnkStruct_02008DEC_sub *sub_02009358(struct UnkStruct_02008DEC_1 *param0, u32 param3, s32 param4, u32 param5, - HeapID heapId); + enum HeapID heapID); s32 sub_020093A8(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_2 *param1, struct UnkStruct_02008DEC_5 *param2, - HeapID heapId); + enum HeapID heapID); void sub_020093DC(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_2 *param1, s32 param2, s32 param3, struct UnkStruct_02008DEC_5 *param4, - HeapID heapId); -struct UnkStruct_02008DEC_5 *sub_02009424(s32 param0, HeapID heapId); + enum HeapID heapID); +struct UnkStruct_02008DEC_5 *sub_02009424(s32 param0, enum HeapID heapID); void sub_02009448(struct UnkStruct_02008DEC_5 *param0); u32 sub_0200945C(struct UnkStruct_02008DEC_1 *param0, s32 param1); void sub_02009474(struct UnkStruct_02008DEC_sub *param0); @@ -198,7 +198,7 @@ u32 sub_02009610(struct UnkStruct_02008DEC_sub *param0); void sub_02009630(struct UnkStruct_02008DEC_sub *param0, u32 param1); u32 sub_0200965C(void); struct UnkStruct_02008DEC_2 *sub_02009660(struct UnkStruct_02008DEC_2 *param0, s32 param1); -void sub_02009668(u32 *param0, struct UnkStruct_02008DEC_2 *param1, HeapID heapId); +void sub_02009668(u32 *param0, struct UnkStruct_02008DEC_2 *param1, enum HeapID heapID); void sub_020096B4(struct UnkStruct_02008DEC_2 *param0); s32 sub_020096CC(struct UnkStruct_02008DEC_2 *param0); s32 sub_020096DC(struct UnkStruct_02008DEC_2 *param0, s32 param1); @@ -208,13 +208,13 @@ u32 sub_02009768(struct UnkStruct_02008DEC_2 *param0, s32 param1); u32 sub_0200979C(struct UnkStruct_02008DEC_2 *param0, s32 param1); struct UnkStruct_02008DEC_sub *sub_020097D0(struct UnkStruct_02008DEC_1 *param0); void sub_020097FC( - struct UnkStruct_02008DEC_sub *param0, u32 param1, u32 param2, u32 param3, HeapID heapId); -struct CharacterData_02008DEC *sub_0200986C(void *param0, u32 param1, HeapID heapId); -struct PaletteData_02008DEC *sub_0200988C(void *param0, u32 param1, u32 param2, HeapID heapId); -struct CellDataBank_02008DEC *sub_020098B0(void *param0, HeapID heapId); -struct AnimBank_02008DEC *sub_020098CC(void *param0, HeapID heapId); -void *sub_020098E8(void *param0, HeapID heapId); -void *sub_02009904(void *param0, HeapID heapId); + struct UnkStruct_02008DEC_sub *param0, u32 param1, u32 param2, u32 param3, enum HeapID heapID); +struct CharacterData_02008DEC *sub_0200986C(void *param0, u32 param1, enum HeapID heapID); +struct PaletteData_02008DEC *sub_0200988C(void *param0, u32 param1, u32 param2, enum HeapID heapID); +struct CellDataBank_02008DEC *sub_020098B0(void *param0, enum HeapID heapID); +struct AnimBank_02008DEC *sub_020098CC(void *param0, enum HeapID heapID); +void *sub_020098E8(void *param0, enum HeapID heapID); +void *sub_02009904(void *param0, enum HeapID heapID); void sub_02009920(struct UnkStruct_02008DEC_sub *param0); u32 *sub_02009934(struct UnkStruct_02008DEC_sub *param0); void sub_0200994C(struct UnkStruct_02008DEC_1 *param0, @@ -224,7 +224,7 @@ void sub_0200994C(struct UnkStruct_02008DEC_1 *param0, u32 param4, u32 param5, u32 param6, - HeapID heapId); + enum HeapID heapID); void sub_02009978(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_sub *param1, NarcId param2, @@ -234,7 +234,7 @@ void sub_02009978(struct UnkStruct_02008DEC_1 *param0, u32 param6, u32 param7, u32 param8, - HeapID heapId, + enum HeapID heapID, BOOL param10); void sub_020099B0(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_sub *param1, @@ -245,10 +245,10 @@ void sub_020099B0(struct UnkStruct_02008DEC_1 *param0, u32 param6, u32 param7, u32 param8, - HeapID heapId, + enum HeapID heapID, u32 param10); s32 sub_020099E8(struct UnkStruct_02008DEC_4 *param0); -void *sub_02009A04(NARC *param0, u32 param1, u32 param2, HeapID heapId, u32 param4); +void *sub_02009A04(NARC *param0, u32 param1, u32 param2, enum HeapID heapID, u32 param4); u32 sub_02009A50(struct UnkStruct_02008DEC_sub *param0); void sub_02009A90(struct UnkStruct_02008DEC_5 *param0); u32 sub_02009AC4(struct UnkStruct_02008DEC_sub *param0); diff --git a/include/unk_0200BB14.h b/include/unk_0200BB14.h index 3df663a68..501d58eee 100644 --- a/include/unk_0200BB14.h +++ b/include/unk_0200BB14.h @@ -6,7 +6,7 @@ #include "unk_02008DEC.h" struct UnkStruct_0200BB14_1 { - HeapID heapId; + enum HeapID heapID; u32 unk004; u32 unk008; u32 unk00c; @@ -77,7 +77,7 @@ struct UnkStruct_0200BB14_5 { u32 unk0c; }; -struct UnkStruct_0200BB14_1 *sub_0200BB14(HeapID heapId); +struct UnkStruct_0200BB14_1 *sub_0200BB14(enum HeapID heapID); struct UnkStruct_0200BB14_2 *sub_0200BB34(struct UnkStruct_0200BB14_1 *param0); u32 sub_0200BB68(u32 param0); BOOL sub_0200BB6C(struct UnkStruct_0200BB14_1 *param0, u32 *param1, u32 *param2, u32 param3); @@ -113,14 +113,14 @@ u32 sub_0200BE74(u32 *param0, u32 param13); BOOL sub_0200BF60( struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, s32 *param2); -BOOL sub_0200C00C(HeapID *heapId, +BOOL sub_0200C00C(enum HeapID *heapID, struct UnkStruct_0200BB14_2 *param1, NarcId param2, s32 param3, BOOL param4, u32 param5, s32 param6); -s32 sub_0200C06C(HeapID *heapId, +s32 sub_0200C06C(enum HeapID *heapID, struct UnkStruct_0200BB14_2 *param1, NarcId param2, s32 param3, @@ -130,7 +130,7 @@ s32 sub_0200C06C(HeapID *heapId, s32 param7); u8 sub_0200C0DC(u32 param0, u32 param1, - HeapID *heapId, + enum HeapID *heapID, struct UnkStruct_0200BB14_2 *param3, NarcId param4, s32 param5, @@ -138,13 +138,13 @@ u8 sub_0200C0DC(u32 param0, u32 param7, u32 param8, s32 param9); -BOOL sub_0200C124(HeapID *heapId, +BOOL sub_0200C124(enum HeapID *heapID, struct UnkStruct_0200BB14_2 *param1, NarcId param2, s32 param3, BOOL param4, s32 param5); -BOOL sub_0200C13C(HeapID *heapId, +BOOL sub_0200C13C(enum HeapID *heapID, struct UnkStruct_0200BB14_2 *param1, NarcId param2, s32 param3, @@ -160,7 +160,7 @@ BOOL sub_0200C378(struct UnkStruct_0200BB14_2 *param0, u32 param1); BOOL sub_0200C388(struct UnkStruct_0200BB14_2 *param0, u32 param1); void sub_0200C398(struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1); void sub_0200C3DC(u32 *param0); -BOOL sub_0200C404(HeapID *heapId, +BOOL sub_0200C404(enum HeapID *heapID, struct UnkStruct_0200BB14_2 *param1, NarcId param2, s32 param3, @@ -226,14 +226,14 @@ void sub_0200C8DC(u32 *param0, u32 param1, u32 param2); void sub_0200C8F8(u32 *param0, u32 param1); void sub_0200C904(u32 param0, u32 param1); void sub_0200C90C(u32 *param0, u32 param1); -BOOL sub_0200C918(HeapID *heapId, +BOOL sub_0200C918(enum HeapID *heapID, struct UnkStruct_0200BB14_2 *param1, NarcId param2, s32 param3, BOOL param4, u32 param5, s32 param6); -BOOL sub_0200C978(HeapID *heapId, +BOOL sub_0200C978(enum HeapID *heapID, struct UnkStruct_0200BB14_2 *param1, NarcId param2, s32 param3, @@ -241,9 +241,9 @@ BOOL sub_0200C978(HeapID *heapId, u32 param5, s32 param6); void sub_0200C9D8( - HeapID *heapId, struct UnkStruct_02008DEC_1 **param1, NarcId param2, s32 param3, BOOL param4, s32 param5); + enum HeapID *heapID, struct UnkStruct_02008DEC_1 **param1, NarcId param2, s32 param3, BOOL param4, s32 param5); void sub_0200CA0C( - HeapID *heapId, struct UnkStruct_02008DEC_1 **param1, NarcId param2, s32 param3, BOOL param4, s32 param5); + enum HeapID *heapID, struct UnkStruct_02008DEC_1 **param1, NarcId param2, s32 param3, BOOL param4, s32 param5); u32 sub_0200CA40(u32 *param0); #endif // POKEDIAMOND_UNK_0200BB14_H diff --git a/include/unk_02021590.h b/include/unk_02021590.h index c037044a2..d41d190a0 100644 --- a/include/unk_02021590.h +++ b/include/unk_02021590.h @@ -29,14 +29,14 @@ struct FontData { u8 *glyphWidths; }; -struct FontData *FontData_New(NarcId narcId, s32 fileId, u32 unk2, BOOL unk3, HeapID heapId); +struct FontData *FontData_New(NarcId narcId, s32 fileId, u32 unk2, BOOL unk3, enum HeapID heapID); void FontData_Delete(struct FontData *ptr); -void FontData_ModeSwitch(struct FontData *ptr, u32 a1, HeapID heapId); -void FontData_Init(struct FontData *ptr, NarcId narcId, s32 fileId, BOOL unk, HeapID heapId); +void FontData_ModeSwitch(struct FontData *ptr, u32 a1, enum HeapID heapID); +void FontData_Init(struct FontData *ptr, NarcId narcId, s32 fileId, BOOL unk, enum HeapID heapID); void FontData_FreeWidthsAndNarc(struct FontData *ptr); -void InitFontResources(struct FontData *ptr, u32 a1, HeapID heapId); -void InitFontResources_FromPreloaded(struct FontData *ptr, HeapID heapId); -void InitFontResources_LazyFromNarc(struct FontData *ptr, HeapID heapId); +void InitFontResources(struct FontData *ptr, u32 a1, enum HeapID heapID); +void InitFontResources_FromPreloaded(struct FontData *ptr, enum HeapID heapID); +void InitFontResources_LazyFromNarc(struct FontData *ptr, enum HeapID heapID); void FreeLoadedFontResources(struct FontData *ptr); void FreeLoadedFontResources_FromPreloaded(struct FontData *ptr); void FreeLoadedFontResources_LazyFromNarc(struct FontData *ptr); diff --git a/include/unk_02021FF8.h b/include/unk_02021FF8.h index 98af00e1c..31979cc89 100644 --- a/include/unk_02021FF8.h +++ b/include/unk_02021FF8.h @@ -19,7 +19,7 @@ struct UnkStruct_020220C4 { struct UnkStruct_020220C4_sub *field_10; }; -struct UnkStruct_020220C4 *sub_020220C4(u8 *a0, u32 a1, void (*a2)(s32, s32, u32), u32 a3, HeapID heapId); +struct UnkStruct_020220C4 *sub_020220C4(u8 *a0, u32 a1, void (*a2)(s32, s32, u32), u32 a3, enum HeapID heapID); void sub_02022120(struct UnkStruct_020220C4_sub *sub); void sub_0202212C(struct UnkStruct_020220C4 *unk); void sub_02022144(struct UnkStruct_020220C4 *unk); diff --git a/include/unk_02022504.h b/include/unk_02022504.h index 78ea888ba..89e73ec1b 100644 --- a/include/unk_02022504.h +++ b/include/unk_02022504.h @@ -11,7 +11,7 @@ SafariZone *Save_SafariZone_Get(struct SaveData *save); struct PCStorage *SaveArray_PCStorage_Get(struct SaveData *save); struct UnkStruct_0202AC20 *sub_0202251C(struct SaveData *save); void *sub_02022528(struct SaveData *save); -HallOfFame *LoadHallOfFame(struct SaveData *save, HeapID heapId, int *ret_p); +HallOfFame *LoadHallOfFame(struct SaveData *save, enum HeapID heapID, int *ret_p); s32 SaveHallOfFame(struct SaveData *save, HallOfFame *data); #endif // POKEDIAMOND_UNK_02022504_H diff --git a/include/unk_020254B8.h b/include/unk_020254B8.h index 8dedc5dea..42c50cc66 100644 --- a/include/unk_020254B8.h +++ b/include/unk_020254B8.h @@ -21,7 +21,7 @@ void sub_020254CC(struct UnkStruct_020254B8 *arr); u16 *sub_020254F0(struct UnkStruct_020254B8 *arr, s32 i); u8 sub_020254F8(struct UnkStruct_020254B8 *unk, s32 i); BOOL sub_02025500(struct UnkStruct_020254B8 *a, struct UnkStruct_020254B8 *b); -void sub_02025520(struct UnkStruct_020254B8 *sp0, struct UnkStruct_020254B8 *sp4, s32 n, HeapID heapId); +void sub_02025520(struct UnkStruct_020254B8 *sp0, struct UnkStruct_020254B8 *sp4, s32 n, enum HeapID heapID); s32 sub_02025614(struct UnkStruct_020254B8 *a0, u32 a1); #endif // POKEDIAMOND_UNK_020254B8_H diff --git a/include/unk_0202A1E0.h b/include/unk_0202A1E0.h index bd1e674ed..c83e323e6 100644 --- a/include/unk_0202A1E0.h +++ b/include/unk_0202A1E0.h @@ -182,7 +182,7 @@ void sub_0202A784(struct SaveStruct23_Substruct4 *substruct4, struct Unk0202A784 void sub_0202A798(struct SaveStruct23_Substruct4 *substruct4, struct Unk0202A798 *arg1, u32 arg2); void sub_0202A838(struct SaveStruct23_Substruct4 *substruct4, struct SaveStruct23_Substruct4_Substruct2 *substruct4_substruct2, u8 arg2, u8 arg3); void sub_0202A864(struct SaveStruct23_Substruct4 *substruct4, struct Unk0202A784 *dest); -struct SaveStruct23_Substruct4_Substruct2 *sub_0202A878(struct SaveStruct23_Substruct4 *substruct4, HeapID heapId); +struct SaveStruct23_Substruct4_Substruct2 *sub_0202A878(struct SaveStruct23_Substruct4 *substruct4, enum HeapID heapID); s32 SaveStruct23_sizeof(); void SaveStruct23_Init(struct SaveStruct23 *saveStruct23); struct SaveStruct23_Substruct1 *SaveStruct23_GetSubstruct1(struct SaveData *save); diff --git a/include/unk_02031480.h b/include/unk_02031480.h index b257556fc..dce147b78 100644 --- a/include/unk_02031480.h +++ b/include/unk_02031480.h @@ -7,7 +7,7 @@ #include "heap.h" #include "unk_0202F150.h" -void sub_02031480(HeapID heapId); +void sub_02031480(enum HeapID heapID); void sub_020314D0(); BOOL sub_020314E8(); void sub_020314FC(u8 param0, u32 param1, u8 *param2); diff --git a/include/unk_020337E8.h b/include/unk_020337E8.h index 1ec5f90c9..7ad80262a 100644 --- a/include/unk_020337E8.h +++ b/include/unk_020337E8.h @@ -15,7 +15,7 @@ struct DWC_token { u8 fill0[0xC]; }; -s32 sub_020337E8(HeapID heapId); +s32 sub_020337E8(enum HeapID heapID); void sub_0203380C(struct DWC_Struct *); s32 sub_02033830(struct DWC_Struct *); BOOL sub_0203384C(struct SaveData *); diff --git a/include/unk_0205FA2C.h b/include/unk_0205FA2C.h index 01ae50776..9a2cda4ea 100644 --- a/include/unk_0205FA2C.h +++ b/include/unk_0205FA2C.h @@ -79,11 +79,11 @@ struct UnkCallbackStruct2_0205FA2C { }; u32 sub_0205FA2C( - struct UnkCallbackStruct1_0205FA2C *param0, struct FieldSystem *fieldSystem, HeapID heapId); + struct UnkCallbackStruct1_0205FA2C *param0, struct FieldSystem *fieldSystem, enum HeapID heapID); u32 sub_0205FAD8( struct UnkCallbackStruct1_0205FA2C *param0, struct FieldSystem *fieldSystem); u32 sub_0205FB34( - struct UnkCallbackStruct1_0205FA2C *param0, struct FieldSystem *fieldSystem, HeapID heapId); + struct UnkCallbackStruct1_0205FA2C *param0, struct FieldSystem *fieldSystem, enum HeapID heapID); u32 sub_0205FBC0( struct UnkCallbackStruct1_0205FA2C *param0, struct FieldSystem *fieldSystem); BOOL sub_0205FBE8(struct TaskManager *taskManager); diff --git a/include/unk_02064E4C.h b/include/unk_02064E4C.h index 0798914f3..7ab720845 100644 --- a/include/unk_02064E4C.h +++ b/include/unk_02064E4C.h @@ -5,6 +5,6 @@ #include "string16.h" void sub_02064E4C(struct MsgData *msgData, u16 map_sec, struct String *dest); -void sub_02064E60(u32 map_no, HeapID heapId, struct String *dest); +void sub_02064E60(u32 map_no, enum HeapID heapID, struct String *dest); #endif diff --git a/include/unk_020851B8.h b/include/unk_020851B8.h index 2cdeb55d6..e24d13687 100644 --- a/include/unk_020851B8.h +++ b/include/unk_020851B8.h @@ -11,7 +11,7 @@ struct UnkStruct_020851B8 { u8 unk_B; }; -struct UnkStruct_020851B8 *sub_020851B8(u8 heapId); +struct UnkStruct_020851B8 *sub_020851B8(u8 heapID); void sub_020851DC(struct UnkStruct_020851B8 *param0, u16 param1, BOOL param2); void sub_020851F8(struct UnkStruct_020851B8 *param0, u8 param1, u8 param2, u8 param3); void sub_02085200(struct UnkStruct_020851B8 *param0, u16 param1); diff --git a/include/unk_02085338.h b/include/unk_02085338.h index afe3134e5..146e9eddd 100644 --- a/include/unk_02085338.h +++ b/include/unk_02085338.h @@ -20,7 +20,7 @@ struct UnkStruct_02085338 { u8 padding_20[4]; }; -struct UnkStruct_02085338 *sub_02085338(u8 r5, u8 r7, struct SaveData *save, HeapID heapId); +struct UnkStruct_02085338 *sub_02085338(u8 r5, u8 r7, struct SaveData *save, enum HeapID heapID); void sub_020853A8(struct UnkStruct_02085338 *ptr); void sub_020853B0(struct UnkStruct_02085338 *ptr, u16 a1); void sub_020853B4(struct UnkStruct_02085338 *ptr, u16 a1, u16 a2); diff --git a/include/unk_0208890C.h b/include/unk_0208890C.h index 35238f448..30d8e4591 100644 --- a/include/unk_0208890C.h +++ b/include/unk_0208890C.h @@ -19,8 +19,8 @@ typedef struct PoffinCaseAppData { u32 *unk1C; } PoffinCaseAppData; -struct PoffinCaseAppData *sub_0208890C(u32, struct SaveData *save, HeapID heapId, u32 *); +struct PoffinCaseAppData *sub_0208890C(u32, struct SaveData *save, enum HeapID heapID, u32 *); void sub_02088950(struct FieldSystem *fieldSystem, struct PoffinCaseAppData *); -struct PoffinCaseAppData *sub_02088960(struct FieldSystem *fieldSystem, u32, HeapID heapId); +struct PoffinCaseAppData *sub_02088960(struct FieldSystem *fieldSystem, u32, enum HeapID heapID); #endif diff --git a/include/unk_02088AAC.h b/include/unk_02088AAC.h index 68ebeb275..18271e753 100644 --- a/include/unk_02088AAC.h +++ b/include/unk_02088AAC.h @@ -6,7 +6,7 @@ #include "unk_0208890C.h" struct UnkStruct_02088AAC { - HeapID heapId; + enum HeapID heapID; u16 unk04; u16 unk06; u32 item; diff --git a/include/unk_0208A300.h b/include/unk_0208A300.h index 691735d4b..08374162f 100644 --- a/include/unk_0208A300.h +++ b/include/unk_0208A300.h @@ -10,7 +10,7 @@ struct UnkStruct_0208A300 { u32 unk4; }; -struct UnkStruct_0208A300 *sub_0208A300(HeapID heapId); +struct UnkStruct_0208A300 *sub_0208A300(enum HeapID heapID); void sub_0208A320(struct UnkStruct_0208A300 *unk); u32 sub_0208A328(struct UnkStruct_0208A300 *unk); void sub_0208A32C(struct UnkStruct_0208A300 *unk, u32 a1); diff --git a/include/use_item_on_mon.h b/include/use_item_on_mon.h index 68c3917d5..94d61b3e1 100644 --- a/include/use_item_on_mon.h +++ b/include/use_item_on_mon.h @@ -6,17 +6,17 @@ #include "party.h" #include "pokemon.h" -BOOL CanUseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveId, HeapID heapId); -BOOL CanUseItemOnMonInParty(struct Party *party, u16 itemId, s32 partyIdx, s32 moveIdx, HeapID heapId); -BOOL UseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveIdx, u16 location, HeapID heapId); -BOOL UseItemOnMonInParty(struct Party *party, u16 itemId, s32 partyIdx, s32 moveIdx, u16 location, HeapID heapId); +BOOL CanUseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveId, enum HeapID heapID); +BOOL CanUseItemOnMonInParty(struct Party *party, u16 itemId, s32 partyIdx, s32 moveIdx, enum HeapID heapID); +BOOL UseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveIdx, u16 location, enum HeapID heapID); +BOOL UseItemOnMonInParty(struct Party *party, u16 itemId, s32 partyIdx, s32 moveIdx, u16 location, enum HeapID heapID); u8 MonMoveCanRestorePP(struct Pokemon *pokemon, s32 moveIdx); BOOL MonMoveRestorePP(struct Pokemon *pokemon, s32 moveIdx, s32 ppRestore); BOOL BoostMonMovePpUpBy(struct Pokemon *pokemon, s32 moveIdx, u32 nPpUp); void RestoreMonHPBy(struct Pokemon *pokemon, u32 hp, u32 maxHp, u32 restoration); s32 TryModEV(s32 ev, s32 evSum, s32 by); BOOL CanItemModFriendship(struct Pokemon *pokemon, struct ItemData *itemData); -BOOL DoItemFriendshipMod(struct Pokemon *pokemon, s32 friendship, s32 mod, u16 location, HeapID heapId); +BOOL DoItemFriendshipMod(struct Pokemon *pokemon, s32 friendship, s32 mod, u16 location, enum HeapID heapID); void HealParty(struct Party *party); #endif // POKEDIAMOND_USE_ITEM_ON_MON_H diff --git a/include/wfc_user_info_warning.h b/include/wfc_user_info_warning.h index 9dd2372d8..46a6484a6 100644 --- a/include/wfc_user_info_warning.h +++ b/include/wfc_user_info_warning.h @@ -3,6 +3,6 @@ #include "heap.h" -void ShowWFCUserInfoWarning(HeapID heapId, u32 a1); +void ShowWFCUserInfoWarning(enum HeapID heapID, u32 a1); #endif From 27950d51fe49fb5e13c785a3adac7f3cd9c0b0ea Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Tue, 23 Dec 2025 16:58:19 -0300 Subject: [PATCH 2/2] format --- include/heap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/heap.h b/include/heap.h index 1144d7510..140315548 100644 --- a/include/heap.h +++ b/include/heap.h @@ -11,7 +11,7 @@ #include "NNS_FND_expheap.h" typedef struct HeapParam { - u32 size; // maximum size of the heap + u32 size; // maximum size of the heap OSArenaId arena; // where to allocate the heap from } HeapParam;